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

dbus/test_service.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 "dbus/test_service.h"
 
 #include <stdint.h>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/guid.h"
+#include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "dbus/bus.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
 #include "dbus/object_manager.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
 
 namespace {
@@ skipping 171 matching lines @@
     // As documented in exported_object.h, the service name should be
     // requested after all methods are exposed.
     bus_->RequestOwnership(service_name_,
                            request_ownership_options_,
                            base::Bind(&TestService::OnOwnership,
                                       base::Unretained(this),
                                       base::Bind(&EmptyCallback)));
   }
 }
 
-void TestService::Run(base::MessageLoop* message_loop) {
+void TestService::Run(base::RunLoop* run_loop) {
   Bus::Options bus_options;
   bus_options.bus_type = Bus::SESSION;
   bus_options.connection_type = Bus::PRIVATE;
   bus_options.dbus_task_runner = dbus_task_runner_;
   bus_ = new Bus(bus_options);
 
   exported_object_ = bus_->GetExportedObject(
       ObjectPath("/org/chromium/TestObject"));
 
   int num_methods = 0;
@@ skipping 79 matching lines @@
                   base::Unretained(this)),
        base::Bind(&TestService::OnExported,
                   base::Unretained(this)));
   ++num_methods;
 
   // Just print an error message as we don't want to crash tests.
   // Tests will fail at a call to WaitUntilServiceIsStarted().
   if (num_methods != kNumMethodsToExport) {
     LOG(ERROR) << "The number of methods does not match";
   }
-  message_loop->Run();
+  run_loop->Run();
 }
 
 void TestService::Echo(MethodCall* method_call,
                        ExportedObject::ResponseSender response_sender) {
   MessageReader reader(method_call);
   std::string text_message;
   if (!reader.PopString(&text_message)) {
     response_sender.Run(std::unique_ptr<Response>());
     return;
   }
@@ skipping 427 matching lines @@
   MessageWriter invalidated_array_writer(NULL);
 
   writer.OpenArray("s", &invalidated_array_writer);
   invalidated_array_writer.AppendString("Name");
   writer.CloseContainer(&invalidated_array_writer);
 
   exported_object_->SendSignal(&signal);
 }
 
 }  // namespace dbus