Merged FakedDBusThreadManager with DBusThreadManager.

chromeos/network/network_device_handler_unittest.cc

Index: chromeos/network/network_device_handler_unittest.cc
diff --git a/chromeos/network/network_device_handler_unittest.cc b/chromeos/network/network_device_handler_unittest.cc
index af4b93f36d0190c768e5e85bdb56c82f74143fab..644ac57881bb8489f855225a438e3186ddd4e4fb 100644
--- a/chromeos/network/network_device_handler_unittest.cc
+++ b/chromeos/network/network_device_handler_unittest.cc
@@ -6,7 +6,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_shill_device_client.h"
 #include "chromeos/dbus/fake_shill_manager_client.h"
 #include "chromeos/network/network_device_handler_impl.h"
@@ -32,13 +32,9 @@ class NetworkDeviceHandlerTest : public testing::Test {
   virtual ~NetworkDeviceHandlerTest() {}
 
   virtual void SetUp() OVERRIDE {
-    FakeDBusThreadManager* dbus_manager = new FakeDBusThreadManager;
-    dbus_manager->SetFakeShillClients();
-
     fake_device_client_ = new FakeShillDeviceClient;
-    dbus_manager->SetShillDeviceClient(
+    DBusThreadManager::GetSetterForTesting()->SetShillDeviceClient(
         scoped_ptr<ShillDeviceClient>(fake_device_client_));
-    DBusThreadManager::InitializeForTesting(dbus_manager);
 
     success_callback_ = base::Bind(&NetworkDeviceHandlerTest::SuccessCallback,
                                    base::Unretained(this));