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

services/shell/background/background_shell.cc

 // Copyright 2016 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 "services/shell/background/background_shell.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_pump_default.h"
 #include "base/path_service.h"
+#include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/simple_thread.h"
 #include "services/catalog/store.h"
 #include "services/shell/connect_params.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/shell/public/cpp/shell_connection.h"
 #include "services/shell/shell.h"
 #include "services/shell/standalone/context.h"
 
 namespace shell {
@@ skipping 24 matching lines @@
  public:
   explicit MojoThread(std::unique_ptr<BackgroundShell::InitParams> init_params)
       : SimpleThread("mojo-background-shell"),
         init_params_(std::move(init_params)) {}
   ~MojoThread() override {}
 
   void CreateShellClientRequest(base::WaitableEvent* signal,
                                 const std::string& name,
                                 mojom::ShellClientRequest* request) {
     // Only valid to call this on the background thread.
-    DCHECK_EQ(message_loop_, base::MessageLoop::current());
+    DCHECK(message_loop_->task_runner()->BelongsToCurrentThread());
     *request = context_->shell()->InitInstanceForEmbedder(name);
     signal->Signal();
   }
 
   void Connect(std::unique_ptr<ConnectParams> params) {
     context_->shell()->Connect(std::move(params));
   }
 
   base::MessageLoop* message_loop() { return message_loop_; }
 
   // Stops the background thread.
   void Stop() {
     DCHECK_NE(message_loop_, base::MessageLoop::current());
     message_loop_->task_runner()->PostTask(
         FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
     Join();
   }
 
   void RunShellCallback(const BackgroundShell::ShellThreadCallback& callback) {
-    DCHECK_EQ(message_loop_, base::MessageLoop::current());
+    DCHECK(message_loop_->task_runner()->BelongsToCurrentThread());
     callback.Run(context_->shell());
   }
 
   // base::SimpleThread:
   void Start() override {
     DCHECK(!message_loop_);
     message_loop_ = new MojoMessageLoop;
     base::SimpleThread::Start();
   }
   void Run() override {
@@ skipping 58 matching lines @@
 
 mojom::ShellClientRequest BackgroundShell::CreateShellClientRequest(
     const std::string& name) {
   std::unique_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateShellIdentity());
   params->set_target(Identity(name, mojom::kRootUserID));
   mojom::ShellClientRequest request;
   base::WaitableEvent signal(base::WaitableEvent::ResetPolicy::MANUAL,
                              base::WaitableEvent::InitialState::NOT_SIGNALED);
   thread_->message_loop()->task_runner()->PostTask(
-      FROM_HERE, base::Bind(&MojoThread::CreateShellClientRequest,
-                            base::Unretained(thread_.get()), &signal, name,
-                            &request));
+      FROM_HERE,
+      base::Bind(&MojoThread::CreateShellClientRequest,
+                 base::Unretained(thread_.get()), &signal, name, &request));
   signal.Wait();
   thread_->message_loop()->task_runner()->PostTask(
-      FROM_HERE, base::Bind(&MojoThread::Connect,
-                            base::Unretained(thread_.get()),
-                            base::Passed(&params)));
+      FROM_HERE,
+      base::Bind(&MojoThread::Connect, base::Unretained(thread_.get()),
+                 base::Passed(&params)));
   return request;
 }
 
 void BackgroundShell::ExecuteOnShellThread(
     const ShellThreadCallback& callback) {
   thread_->message_loop()->task_runner()->PostTask(
       FROM_HERE, base::Bind(&MojoThread::RunShellCallback,
                             base::Unretained(thread_.get()), callback));
 }
 
 }  // namespace shell