Give each ShutdownNotifierFactory class its own class name
In jumbo builds many cc files are compiled in the same translation
unit and then classes with the same name, that are normally
shielded from each other, can start clashing and causing
compilation errors.
One observation is that there are many ShutdownNotifier classes and
this patch gives each a long and unique name following the typical
naming standard.
Bug: 746957
Change-Id: I2bcca0ac41685fdf78c491ed969b91669e520772
Reviewed-on: https://chromium-review.googlesource.com/867919
Reviewed-by: Lei Zhang <[email protected]>
Commit-Queue: Daniel Bratell <[email protected]>
Cr-Commit-Position: refs/heads/master@{#529504}diff --git a/chrome/browser/plugins/plugin_info_host_impl.cc b/chrome/browser/plugins/plugin_info_host_impl.cc
index 6af9a7c7..312e27d1 100644
--- a/chrome/browser/plugins/plugin_info_host_impl.cc
+++ b/chrome/browser/plugins/plugin_info_host_impl.cc
@@ -73,23 +73,24 @@
namespace {
-class ShutdownNotifierFactory
+class PluginInfoHostImplShutdownNotifierFactory
: public BrowserContextKeyedServiceShutdownNotifierFactory {
public:
- static ShutdownNotifierFactory* GetInstance() {
- return base::Singleton<ShutdownNotifierFactory>::get();
+ static PluginInfoHostImplShutdownNotifierFactory* GetInstance() {
+ return base::Singleton<PluginInfoHostImplShutdownNotifierFactory>::get();
}
private:
- friend struct base::DefaultSingletonTraits<ShutdownNotifierFactory>;
+ friend struct base::DefaultSingletonTraits<
+ PluginInfoHostImplShutdownNotifierFactory>;
- ShutdownNotifierFactory()
+ PluginInfoHostImplShutdownNotifierFactory()
: BrowserContextKeyedServiceShutdownNotifierFactory(
"PluginInfoHostImpl") {}
- ~ShutdownNotifierFactory() override {}
+ ~PluginInfoHostImplShutdownNotifierFactory() override {}
- DISALLOW_COPY_AND_ASSIGN(ShutdownNotifierFactory);
+ DISALLOW_COPY_AND_ASSIGN(PluginInfoHostImplShutdownNotifierFactory);
};
#if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -160,9 +161,10 @@
main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
binding_(this) {
shutdown_notifier_ =
- ShutdownNotifierFactory::GetInstance()->Get(profile)->Subscribe(
- base::Bind(&PluginInfoHostImpl::ShutdownOnUIThread,
- base::Unretained(this)));
+ PluginInfoHostImplShutdownNotifierFactory::GetInstance()
+ ->Get(profile)
+ ->Subscribe(base::Bind(&PluginInfoHostImpl::ShutdownOnUIThread,
+ base::Unretained(this)));
}
void PluginInfoHostImpl::ShutdownOnUIThread() {
