Merged FakedDBusThreadManager with DBusThreadManager.

chromeos/disks/disk_mount_manager_unittest.cc

Index: chromeos/disks/disk_mount_manager_unittest.cc
diff --git a/chromeos/disks/disk_mount_manager_unittest.cc b/chromeos/disks/disk_mount_manager_unittest.cc
index b7a8e49e453dd9af9691a6d9f61ded1936e997f1..674ee7ab45a61cd887675e8e345f189a6ae4d00e 100644
--- a/chromeos/disks/disk_mount_manager_unittest.cc
+++ b/chromeos/disks/disk_mount_manager_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_cros_disks_client.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -14,7 +14,6 @@ using chromeos::disks::DiskMountManager;
 using chromeos::CrosDisksClient;
 using chromeos::DBusThreadManager;
 using chromeos::FakeCrosDisksClient;
-using chromeos::FakeDBusThreadManager;
 using testing::_;
 using testing::Field;
 using testing::InSequence;
@@ -123,13 +122,10 @@ class DiskMountManagerTest : public testing::Test {
   // Initializes disk mount manager disks and mount points.
   // Adds a test observer to the disk mount manager.
   virtual void SetUp() {
-    FakeDBusThreadManager* fake_thread_manager = new FakeDBusThreadManager();
     fake_cros_disks_client_ = new FakeCrosDisksClient;
-    fake_thread_manager->SetCrosDisksClient(
+    DBusThreadManager::GetSetterForTesting()->SetCrosDisksClient(
         scoped_ptr<CrosDisksClient>(fake_cros_disks_client_));
 
-    DBusThreadManager::InitializeForTesting(fake_thread_manager);
-
     DiskMountManager::Initialize();
 
     InitDisksAndMountPoints();