Remove calls to MessageLoop::current() in base.

content/browser/browser_thread_impl.cc

 // Copyright (c) 2012 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 <string.h>
 
 #include <string>
 
 #include "base/atomicops.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/profiler/scoped_tracker.h"
+#include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_thread_delegate.h"
 #include "content/public/browser/content_browser_client.h"
 #include "net/disk_cache/simple/simple_backend_impl.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
@@ skipping 144 matching lines @@
       reinterpret_cast<BrowserThreadDelegate*>(stored_pointer);
   if (delegate)
     delegate->Init();
 }
 
 // We disable optimizations for this block of functions so the compiler doesn't
 // merge them all together.
 MSVC_DISABLE_OPTIMIZE()
 MSVC_PUSH_DISABLE_WARNING(4748)
 
-NOINLINE void BrowserThreadImpl::UIThreadRun(base::MessageLoop* message_loop) {
+NOINLINE void BrowserThreadImpl::UIThreadRun(base::RunLoop* run_loop) {
   volatile int line_number = __LINE__;
-  Thread::Run(message_loop);
+  Thread::Run(run_loop);
   CHECK_GT(line_number, 0);
 }
 
-NOINLINE void BrowserThreadImpl::DBThreadRun(base::MessageLoop* message_loop) {
+NOINLINE void BrowserThreadImpl::DBThreadRun(base::RunLoop* run_loop) {
   volatile int line_number = __LINE__;
-  Thread::Run(message_loop);
+  Thread::Run(run_loop);
   CHECK_GT(line_number, 0);
 }
 
-NOINLINE void BrowserThreadImpl::FileThreadRun(
-    base::MessageLoop* message_loop) {
+NOINLINE void BrowserThreadImpl::FileThreadRun(base::RunLoop* run_loop) {
   volatile int line_number = __LINE__;
-  Thread::Run(message_loop);
+  Thread::Run(run_loop);
   CHECK_GT(line_number, 0);
 }
 
 NOINLINE void BrowserThreadImpl::FileUserBlockingThreadRun(
-    base::MessageLoop* message_loop) {
+    base::RunLoop* run_loop) {
   volatile int line_number = __LINE__;
-  Thread::Run(message_loop);
+  Thread::Run(run_loop);
   CHECK_GT(line_number, 0);
 }
 
 NOINLINE void BrowserThreadImpl::ProcessLauncherThreadRun(
-    base::MessageLoop* message_loop) {
+    base::RunLoop* run_loop) {
   volatile int line_number = __LINE__;
-  Thread::Run(message_loop);
+  Thread::Run(run_loop);
   CHECK_GT(line_number, 0);
 }
 
-NOINLINE void BrowserThreadImpl::CacheThreadRun(
-    base::MessageLoop* message_loop) {
+NOINLINE void BrowserThreadImpl::CacheThreadRun(base::RunLoop* run_loop) {
   volatile int line_number = __LINE__;
-  Thread::Run(message_loop);
+  Thread::Run(run_loop);
   CHECK_GT(line_number, 0);
 }
 
-NOINLINE void BrowserThreadImpl::IOThreadRun(base::MessageLoop* message_loop) {
+NOINLINE void BrowserThreadImpl::IOThreadRun(base::RunLoop* run_loop) {
   volatile int line_number = __LINE__;
-  Thread::Run(message_loop);
+  Thread::Run(run_loop);
   CHECK_GT(line_number, 0);
 }
 
 MSVC_POP_WARNING()
 MSVC_ENABLE_OPTIMIZE();
 
-void BrowserThreadImpl::Run(base::MessageLoop* message_loop) {
+void BrowserThreadImpl::Run(base::RunLoop* run_loop) {
 #if defined(OS_ANDROID)
   // Not to reset thread name to "Thread-???" by VM, attach VM with thread name.
   // Though it may create unnecessary VM thread objects, keeping thread name
   // gives more benefit in debugging in the platform.
   if (!thread_name().empty()) {
     base::android::AttachCurrentThreadWithName(thread_name());
   }
 #endif
 
   BrowserThread::ID thread_id = ID_COUNT;
   CHECK(GetCurrentThreadIdentifier(&thread_id));
   CHECK_EQ(identifier_, thread_id);
-  CHECK_EQ(Thread::message_loop(), message_loop);
 
   switch (identifier_) {
     case BrowserThread::UI:
-      return UIThreadRun(message_loop);
+      return UIThreadRun(run_loop);
     case BrowserThread::DB:
-      return DBThreadRun(message_loop);
+      return DBThreadRun(run_loop);
     case BrowserThread::FILE:
-      return FileThreadRun(message_loop);
+      return FileThreadRun(run_loop);
     case BrowserThread::FILE_USER_BLOCKING:
-      return FileUserBlockingThreadRun(message_loop);
+      return FileUserBlockingThreadRun(run_loop);
     case BrowserThread::PROCESS_LAUNCHER:
-      return ProcessLauncherThreadRun(message_loop);
+      return ProcessLauncherThreadRun(run_loop);
     case BrowserThread::CACHE:
-      return CacheThreadRun(message_loop);
+      return CacheThreadRun(run_loop);
     case BrowserThread::IO:
-      return IOThreadRun(message_loop);
+      return IOThreadRun(run_loop);
     case BrowserThread::ID_COUNT:
       CHECK(false);  // This shouldn't actually be reached!
       break;
   }
 
   // |identifier_| must be set to a valid enum value in the constructor, so it
   // should be impossible to reach here.
   CHECK(false);
 }
 
@@ skipping 277 matching lines @@
   AtomicWord* storage = reinterpret_cast<AtomicWord*>(
       &globals.thread_delegates[identifier]);
   AtomicWord old_pointer = base::subtle::NoBarrier_AtomicExchange(
       storage, reinterpret_cast<AtomicWord>(delegate));
 
   // This catches registration when previously registered.
   DCHECK(!delegate || !old_pointer);
 }
 
 }  // namespace content