Make different g_observers and g_instances have unique names
This is preporatory patch to make content/browser able to do
jumbo compiles, i.e. compilation with many cc files merged into
one translation unit. For that to compile, names need to be a bit
more unique than they are today.
Bug: 746953
Change-Id: Ie7cb7445d3662d47372bde78df705aec7b130ed5
Reviewed-on: https://chromium-review.googlesource.com/721021
Commit-Queue: Avi Drissman <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Cr-Commit-Position: refs/heads/master@{#509429}diff --git a/content/browser/browser_child_process_host_impl.cc b/content/browser/browser_child_process_host_impl.cc
index 3da9901..82176c4 100644
--- a/content/browser/browser_child_process_host_impl.cc
+++ b/content/browser/browser_child_process_host_impl.cc
@@ -63,30 +63,31 @@
g_child_process_list = LAZY_INSTANCE_INITIALIZER;
base::LazyInstance<base::ObserverList<BrowserChildProcessObserver>>::
- DestructorAtExit g_observers = LAZY_INSTANCE_INITIALIZER;
+ DestructorAtExit g_browser_child_process_observers =
+ LAZY_INSTANCE_INITIALIZER;
void NotifyProcessLaunchedAndConnected(const ChildProcessData& data) {
- for (auto& observer : g_observers.Get())
+ for (auto& observer : g_browser_child_process_observers.Get())
observer.BrowserChildProcessLaunchedAndConnected(data);
}
void NotifyProcessHostConnected(const ChildProcessData& data) {
- for (auto& observer : g_observers.Get())
+ for (auto& observer : g_browser_child_process_observers.Get())
observer.BrowserChildProcessHostConnected(data);
}
void NotifyProcessHostDisconnected(const ChildProcessData& data) {
- for (auto& observer : g_observers.Get())
+ for (auto& observer : g_browser_child_process_observers.Get())
observer.BrowserChildProcessHostDisconnected(data);
}
void NotifyProcessCrashed(const ChildProcessData& data, int exit_code) {
- for (auto& observer : g_observers.Get())
+ for (auto& observer : g_browser_child_process_observers.Get())
observer.BrowserChildProcessCrashed(data, exit_code);
}
void NotifyProcessKilled(const ChildProcessData& data, int exit_code) {
- for (auto& observer : g_observers.Get())
+ for (auto& observer : g_browser_child_process_observers.Get())
observer.BrowserChildProcessKilled(data, exit_code);
}
@@ -132,14 +133,14 @@
void BrowserChildProcessHostImpl::AddObserver(
BrowserChildProcessObserver* observer) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- g_observers.Get().AddObserver(observer);
+ g_browser_child_process_observers.Get().AddObserver(observer);
}
// static
void BrowserChildProcessHostImpl::RemoveObserver(
BrowserChildProcessObserver* observer) {
// TODO(phajdan.jr): Check thread after fixing http://crbug.com/167126.
- g_observers.Get().RemoveObserver(observer);
+ g_browser_child_process_observers.Get().RemoveObserver(observer);
}
BrowserChildProcessHostImpl::BrowserChildProcessHostImpl(
