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/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);
};
