diff options
Diffstat (limited to 'chromium/content/child/child_process.cc')
| -rw-r--r-- | chromium/content/child/child_process.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/content/child/child_process.cc b/chromium/content/child/child_process.cc index 7b55e6f2a25..43134211220 100644 --- a/chromium/content/child/child_process.cc +++ b/chromium/content/child/child_process.cc @@ -21,7 +21,7 @@ namespace content { namespace { base::LazyInstance<base::ThreadLocalPointer<ChildProcess>>::DestructorAtExit - g_lazy_tls = LAZY_INSTANCE_INITIALIZER; + g_lazy_child_process_tls = LAZY_INSTANCE_INITIALIZER; } ChildProcess::ChildProcess( @@ -32,8 +32,8 @@ ChildProcess::ChildProcess( shutdown_event_(base::WaitableEvent::ResetPolicy::MANUAL, base::WaitableEvent::InitialState::NOT_SIGNALED), io_thread_("Chrome_ChildIOThread") { - DCHECK(!g_lazy_tls.Pointer()->Get()); - g_lazy_tls.Pointer()->Set(this); + DCHECK(!g_lazy_child_process_tls.Pointer()->Get()); + g_lazy_child_process_tls.Pointer()->Set(this); // Initialize TaskScheduler if not already done. A TaskScheduler may already // exist when ChildProcess is instantiated in the browser process or in a @@ -63,7 +63,7 @@ ChildProcess::ChildProcess( } ChildProcess::~ChildProcess() { - DCHECK(g_lazy_tls.Pointer()->Get() == this); + DCHECK(g_lazy_child_process_tls.Pointer()->Get() == this); // Signal this event before destroying the child process. That way all // background threads can cleanup. @@ -82,7 +82,7 @@ ChildProcess::~ChildProcess() { } } - g_lazy_tls.Pointer()->Set(nullptr); + g_lazy_child_process_tls.Pointer()->Set(nullptr); io_thread_.Stop(); if (initialized_task_scheduler_) { @@ -117,7 +117,7 @@ void ChildProcess::ReleaseProcess() { } ChildProcess* ChildProcess::current() { - return g_lazy_tls.Pointer()->Get(); + return g_lazy_child_process_tls.Pointer()->Get(); } base::WaitableEvent* ChildProcess::GetShutDownEvent() { |