Update from https://crrev.com/319330
- New chromium clang rules require explicit external destructors so
system/lib added for MessagePipe, DataPipe and SharedBuffer
- New chromium clang rules require override and no virtual in
declarations, so many files updated.
- cc_strip_video patch updated.
BUG=
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/988693005
diff --git a/shell/app_child_process.cc b/shell/app_child_process.cc
index 0054037..387aa5f 100644
--- a/shell/app_child_process.cc
+++ b/shell/app_child_process.cc
@@ -84,7 +84,7 @@
public:
AppContext()
: io_thread_("io_thread"), controller_thread_("controller_thread") {}
- ~AppContext() {}
+ ~AppContext() override {}
void Init() {
// Initialize Mojo before starting any threads.
diff --git a/shell/application_manager/application_manager.h b/shell/application_manager/application_manager.h
index fee8cdf..05a4fc9 100644
--- a/shell/application_manager/application_manager.h
+++ b/shell/application_manager/application_manager.h
@@ -215,13 +215,12 @@
// Note: The keys are URLs after mapping and resolving.
URLToNativeOptionsMap url_to_native_options_;
- base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
-
base::SequencedWorkerPool* blocking_pool_;
NetworkServicePtr network_service_;
MimeTypeToURLMap mime_type_to_url_;
ScopedVector<NativeRunner> native_runners_;
bool disable_cache_;
+ base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
};
diff --git a/shell/launcher_main.cc b/shell/launcher_main.cc
index 410417b..4a95d53 100644
--- a/shell/launcher_main.cc
+++ b/shell/launcher_main.cc
@@ -46,7 +46,7 @@
&app_args_);
}
- ~Launcher() {
+ ~Launcher() override {
// TODO(vtl): We need to destroy this before calling
// ShutdownIPCSupportOnIOThread(). This is all quite sketchy, and we really
// should convert all of this to running the application on the main thread,
diff --git a/shell/test/pingable_app.cc b/shell/test/pingable_app.cc
index a22ddbe..b864098 100644
--- a/shell/test/pingable_app.cc
+++ b/shell/test/pingable_app.cc
@@ -40,7 +40,7 @@
public mojo::InterfaceFactory<Pingable> {
public:
PingableApp() {}
- ~PingableApp() {}
+ ~PingableApp() override {}
private:
// ApplicationDelegate:
