DBus: Use TaskRunners instead of MessageLoopProxies.

dbus/end_to_end_async_unittest.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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 28 matching lines @@
     base::ThreadRestrictions::SetIOAllowed(false);
 
     // Start the D-Bus thread.
     dbus_thread_.reset(new base::Thread("D-Bus Thread"));
     base::Thread::Options thread_options;
     thread_options.message_loop_type = MessageLoop::TYPE_IO;
     ASSERT_TRUE(dbus_thread_->StartWithOptions(thread_options));
 
     // Start the test service, using the D-Bus thread.
     dbus::TestService::Options options;
-    options.dbus_thread_message_loop_proxy = dbus_thread_->message_loop_proxy();
+    options.dbus_task_runner = dbus_thread_->message_loop_proxy();
     test_service_.reset(new dbus::TestService(options));
     ASSERT_TRUE(test_service_->StartService());
     ASSERT_TRUE(test_service_->WaitUntilServiceIsStarted());
     ASSERT_TRUE(test_service_->HasDBusThread());
 
     // Create the client, using the D-Bus thread.
     dbus::Bus::Options bus_options;
     bus_options.bus_type = dbus::Bus::SESSION;
     bus_options.connection_type = dbus::Bus::PRIVATE;
-    bus_options.dbus_thread_message_loop_proxy =
-        dbus_thread_->message_loop_proxy();
+    bus_options.dbus_task_runner = dbus_thread_->message_loop_proxy();
     bus_options.disconnected_callback =
         base::Bind(&EndToEndAsyncTest::OnDisconnected, base::Unretained(this));
     bus_ = new dbus::Bus(bus_options);
     object_proxy_ = bus_->GetObjectProxy(
         "org.chromium.TestService",
         dbus::ObjectPath("/org/chromium/TestObject"));
     ASSERT_TRUE(bus_->HasDBusThread());
 
     // Connect to the "Test" signal of "org.chromium.TestInterface" from
     // the remote object.
@@ skipping 60 matching lines @@
   void SetUpBrokenBus() {
     // Shut down the existing bus.
     bus_->ShutdownOnDBusThreadAndBlock();
 
     // Create new bus with invalid address.
     const char kInvalidAddress[] = "";
     dbus::Bus::Options bus_options;
     bus_options.bus_type = dbus::Bus::CUSTOM_ADDRESS;
     bus_options.address = kInvalidAddress;
     bus_options.connection_type = dbus::Bus::PRIVATE;
-    bus_options.dbus_thread_message_loop_proxy =
-        dbus_thread_->message_loop_proxy();
+    bus_options.dbus_task_runner = dbus_thread_->message_loop_proxy();
     bus_ = new dbus::Bus(bus_options);
     ASSERT_TRUE(bus_->HasDBusThread());
 
     // Create new object proxy.
     object_proxy_ = bus_->GetObjectProxy(
         "org.chromium.TestService",
         dbus::ObjectPath("/org/chromium/TestObject"));
   }
 
   // Calls the method asynchronously. OnResponse() will be called once the
@@ skipping 484 matching lines @@
   const char kMessage[] = "hello, world";
   // Send the test signal from the exported object.
   test_service_->SendTestSignal(kMessage);
   // Receive the signal with the object proxy.
   WaitForTestSignal();
   // Verify the string WAS NOT received by the original handler.
   ASSERT_TRUE(test_signal_string_.empty());
   // Verify the signal WAS received by the replacement handler.
   ASSERT_EQ(kMessage, replacement_test_signal_string_);
 }