Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/login/reset_browsertest.cc

Index: chrome/browser/chromeos/login/reset_browsertest.cc
diff --git a/chrome/browser/chromeos/login/reset_browsertest.cc b/chrome/browser/chromeos/login/reset_browsertest.cc
index 89eb85aea2cfb352b49c4d1db2d6bbebc5f210d7..a764ff0aa92cdb6d49dbdf4f2ba8ca9548998afd 100644
--- a/chrome/browser/chromeos/login/reset_browsertest.cc
+++ b/chrome/browser/chromeos/login/reset_browsertest.cc
@@ -16,7 +16,6 @@
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/fake_update_engine_client.h"
@@ -46,18 +45,17 @@ class ResetTest : public LoginManagerTest {
 
   // LoginManagerTest overrides:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    FakeDBusThreadManager* dbus_manager = new FakeDBusThreadManager;
-    dbus_manager->SetFakeClients();
+    scoped_ptr<DBusThreadManagerTestHelper> dbus_helper =
+        chromeos::DBusThreadManager::GetDBusThreadManagerTestHelper();
     session_manager_client_ = new FakeSessionManagerClient;
-    dbus_manager->SetSessionManagerClient(
+    dbus_helper->SetSessionManagerClient(
         scoped_ptr<SessionManagerClient>(session_manager_client_));
     power_manager_client_ = new FakePowerManagerClient;
-    dbus_manager->SetPowerManagerClient(
+    dbus_helper->SetPowerManagerClient(
         scoped_ptr<PowerManagerClient>(power_manager_client_));
     update_engine_client_ = new FakeUpdateEngineClient;
-    dbus_manager->SetUpdateEngineClient(
+    dbus_helper->SetUpdateEngineClient(
         scoped_ptr<UpdateEngineClient>(update_engine_client_));
-    DBusThreadManager::SetInstanceForTesting(dbus_manager);
 
     LoginManagerTest::SetUpInProcessBrowserTestFixture();
   }