content: Remove 16 exit time destructors and 15 static initializers.

content/browser/browser_thread_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/browser_thread_impl.h"
 
 #include "base/bind.h"
+#include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/threading/thread_restrictions.h"
 
 namespace {
 
 // Friendly names for the well-known threads.
 static const char* browser_thread_names[content::BrowserThread::ID_COUNT] = {
   "",  // UI (name assembled in browser_main.cc).
   "Chrome_DBThread",  // DB
   "Chrome_WebKitThread",  // WEBKIT
   "Chrome_FileThread",  // FILE
   "Chrome_ProcessLauncherThread",  // PROCESS_LAUNCHER
   "Chrome_CacheThread",  // CACHE
   "Chrome_IOThread",  // IO
 #if defined(OS_CHROMEOS)
   "Chrome_WebSocketproxyThread",  // WEB_SOCKET_PROXY
 #endif
 };
 
 }  // namespace
 
 namespace content {
 
-base::Lock BrowserThreadImpl::lock_;
+namespace {
 
-BrowserThread* BrowserThreadImpl::browser_threads_[ID_COUNT];
+// This lock protects |g_browser_threads|.  Do not read or modify that array
+// without holding this lock.  Do not block while holding this lock.
+base::LazyInstance<base::Lock,
+                   base::LeakyLazyInstanceTraits<base::Lock> >
+    g_lock(base::LINKER_INITIALIZED);
+
+
+// An array of the BrowserThread objects.  This array is protected by |g_lock|.
+// The threads are not owned by this array.  Typically, the threads are owned
+// on the UI thread by the g_browser_process object.  BrowserThreads remove
+// themselves from this array upon destruction.
+BrowserThread* g_browser_threads[BrowserThread::ID_COUNT];
+
+}  // namespace
 
 BrowserThreadImpl::BrowserThreadImpl(BrowserThread::ID identifier)
     : BrowserThread(identifier) {
 }
 
 BrowserThreadImpl::BrowserThreadImpl(BrowserThread::ID identifier,
                                      MessageLoop* message_loop)
     : BrowserThread(identifier, message_loop) {
 }
 
@@ skipping 14 matching lines @@
   // outlives this one.
   // Note: since the array is so small, ok to loop instead of creating a map,
   // which would require a lock because std::map isn't thread safe, defeating
   // the whole purpose of this optimization.
   BrowserThread::ID current_thread;
   bool guaranteed_to_outlive_target_thread =
       GetCurrentThreadIdentifier(&current_thread) &&
       current_thread >= identifier;
 
   if (!guaranteed_to_outlive_target_thread)
-    BrowserThreadImpl::lock_.Acquire();
+    g_lock.Get().Acquire();
 
-  MessageLoop* message_loop = BrowserThreadImpl::browser_threads_[identifier] ?
-      BrowserThreadImpl::browser_threads_[identifier]->message_loop() : NULL;
+  MessageLoop* message_loop = g_browser_threads[identifier] ?
+      g_browser_threads[identifier]->message_loop() : NULL;
   if (message_loop) {
     if (nestable) {
       message_loop->PostDelayedTask(from_here, task, delay_ms);
     } else {
       message_loop->PostNonNestableDelayedTask(from_here, task, delay_ms);
     }
   }
 
   if (!guaranteed_to_outlive_target_thread)
-    BrowserThreadImpl::lock_.Release();
+    g_lock.Get().Release();
 
   if (!message_loop)
     delete task;
 
   return !!message_loop;
 }
 
 // static
 bool BrowserThreadImpl::PostTaskHelper(
     BrowserThread::ID identifier,
     const tracked_objects::Location& from_here,
     const base::Closure& task,
     int64 delay_ms,
     bool nestable) {
   DCHECK(identifier >= 0 && identifier < ID_COUNT);
   // Optimization: to avoid unnecessary locks, we listed the ID enumeration in
   // order of lifetime.  So no need to lock if we know that the other thread
   // outlives this one.
   // Note: since the array is so small, ok to loop instead of creating a map,
   // which would require a lock because std::map isn't thread safe, defeating
   // the whole purpose of this optimization.
   BrowserThread::ID current_thread;
   bool guaranteed_to_outlive_target_thread =
       GetCurrentThreadIdentifier(&current_thread) &&
       current_thread >= identifier;
 
   if (!guaranteed_to_outlive_target_thread)
-    lock_.Acquire();
+    g_lock.Get().Acquire();
 
-  MessageLoop* message_loop = browser_threads_[identifier] ?
-      browser_threads_[identifier]->message_loop() : NULL;
+  MessageLoop* message_loop = g_browser_threads[identifier] ?
+      g_browser_threads[identifier]->message_loop() : NULL;
   if (message_loop) {
     if (nestable) {
       message_loop->PostDelayedTask(from_here, task, delay_ms);
     } else {
       message_loop->PostNonNestableDelayedTask(from_here, task, delay_ms);
     }
   }
 
   if (!guaranteed_to_outlive_target_thread)
-    lock_.Release();
+    g_lock.Get().Release();
 
   return !!message_loop;
 }
 
 // TODO(joi): Remove
 DeprecatedBrowserThread::DeprecatedBrowserThread(BrowserThread::ID identifier)
     : BrowserThread(identifier) {
 }
 DeprecatedBrowserThread::DeprecatedBrowserThread(BrowserThread::ID identifier,
                                                  MessageLoop* message_loop)
@@ skipping 75 matching lines @@
 
 BrowserThread::BrowserThread(ID identifier,
                              MessageLoop* message_loop)
     : Thread(message_loop->thread_name().c_str()),
       identifier_(identifier) {
   set_message_loop(message_loop);
   Initialize();
 }
 
 void BrowserThread::Initialize() {
-  base::AutoLock lock(BrowserThreadImpl::lock_);
+  base::AutoLock lock(g_lock.Get());
   DCHECK(identifier_ >= 0 && identifier_ < ID_COUNT);
-  DCHECK(BrowserThreadImpl::browser_threads_[identifier_] == NULL);
-  BrowserThreadImpl::browser_threads_[identifier_] = this;
+  DCHECK(g_browser_threads[identifier_] == NULL);
+  g_browser_threads[identifier_] = this;
 }
 
 BrowserThread::~BrowserThread() {
   // Stop the thread here, instead of the parent's class destructor.  This is so
   // that if there are pending tasks that run, code that checks that it's on the
   // correct BrowserThread succeeds.
   Stop();
 
-  base::AutoLock lock(BrowserThreadImpl::lock_);
-  BrowserThreadImpl::browser_threads_[identifier_] = NULL;
+  base::AutoLock lock(g_lock.Get());
+  g_browser_threads[identifier_] = NULL;
 #ifndef NDEBUG
   // Double check that the threads are ordered correctly in the enumeration.
   for (int i = identifier_ + 1; i < ID_COUNT; ++i) {
-    DCHECK(!BrowserThreadImpl::browser_threads_[i]) <<
+    DCHECK(!g_browser_threads[i]) <<
         "Threads must be listed in the reverse order that they die";
   }
 #endif
 }
 
 // static
 bool BrowserThread::IsWellKnownThread(ID identifier) {
-  base::AutoLock lock(BrowserThreadImpl::lock_);
+  base::AutoLock lock(g_lock.Get());
   return (identifier >= 0 && identifier < ID_COUNT &&
-          BrowserThreadImpl::browser_threads_[identifier]);
+          g_browser_threads[identifier]);
 }
 
 // static
 bool BrowserThread::CurrentlyOn(ID identifier) {
   // We shouldn't use MessageLoop::current() since it uses LazyInstance which
   // may be deleted by ~AtExitManager when a WorkerPool thread calls this
   // function.
   // http://crbug.com/63678
   base::ThreadRestrictions::ScopedAllowSingleton allow_singleton;
-  base::AutoLock lock(BrowserThreadImpl::lock_);
+  base::AutoLock lock(g_lock.Get());
   DCHECK(identifier >= 0 && identifier < ID_COUNT);
-  return BrowserThreadImpl::browser_threads_[identifier] &&
-         BrowserThreadImpl::browser_threads_[identifier]->message_loop() ==
+  return g_browser_threads[identifier] &&
+         g_browser_threads[identifier]->message_loop() ==
              MessageLoop::current();
 }
 
 // static
 bool BrowserThread::IsMessageLoopValid(ID identifier) {
-  base::AutoLock lock(BrowserThreadImpl::lock_);
+  base::AutoLock lock(g_lock.Get());
   DCHECK(identifier >= 0 && identifier < ID_COUNT);
-  return BrowserThreadImpl::browser_threads_[identifier] &&
-         BrowserThreadImpl::browser_threads_[identifier]->message_loop();
+  return g_browser_threads[identifier] &&
+         g_browser_threads[identifier]->message_loop();
 }
 
 // static
 bool BrowserThread::PostTask(ID identifier,
                              const tracked_objects::Location& from_here,
                              const base::Closure& task) {
   return BrowserThreadImpl::PostTaskHelper(
       identifier, from_here, task, 0, true);
 }
 
@@ skipping 74 matching lines @@
 
 // static
 bool BrowserThread::GetCurrentThreadIdentifier(ID* identifier) {
   // We shouldn't use MessageLoop::current() since it uses LazyInstance which
   // may be deleted by ~AtExitManager when a WorkerPool thread calls this
   // function.
   // http://crbug.com/63678
   base::ThreadRestrictions::ScopedAllowSingleton allow_singleton;
   MessageLoop* cur_message_loop = MessageLoop::current();
   for (int i = 0; i < ID_COUNT; ++i) {
-    if (BrowserThreadImpl::browser_threads_[i] &&
-        BrowserThreadImpl::browser_threads_[i]->message_loop() ==
-            cur_message_loop) {
-      *identifier = BrowserThreadImpl::browser_threads_[i]->identifier_;
+    if (g_browser_threads[i] &&
+        g_browser_threads[i]->message_loop() == cur_message_loop) {
+      *identifier = g_browser_threads[i]->identifier_;
       return true;
     }
   }
 
   return false;
 }
 
 // static
 scoped_refptr<base::MessageLoopProxy>
 BrowserThread::GetMessageLoopProxyForThread(
     ID identifier) {
   scoped_refptr<base::MessageLoopProxy> proxy(
       new BrowserThreadMessageLoopProxy(identifier));
   return proxy;
 }
 
 }  // namespace content