Merged FakedDBusThreadManager with DBusThreadManager.

extensions/shell/browser/shell_desktop_controller_unittest.cc

Index: extensions/shell/browser/shell_desktop_controller_unittest.cc
diff --git a/extensions/shell/browser/shell_desktop_controller_unittest.cc b/extensions/shell/browser/shell_desktop_controller_unittest.cc
index e72bd7309678a0ff59203ff37ec2efcc2dea4c14..b62e6e805afad0cec53673790b70e38e11e0b79d 100644
--- a/extensions/shell/browser/shell_desktop_controller_unittest.cc
+++ b/extensions/shell/browser/shell_desktop_controller_unittest.cc
@@ -11,7 +11,6 @@
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #endif
 
@@ -29,12 +28,11 @@ class ShellDesktopControllerTest : public aura::test::AuraTestBase {
 
   virtual void SetUp() OVERRIDE {
 #if defined(OS_CHROMEOS)
-    chromeos::FakeDBusThreadManager* manager =
-        new chromeos::FakeDBusThreadManager();
+    scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter =
+        chromeos::DBusThreadManager::GetSetterForTesting();
     power_manager_client_ = new chromeos::FakePowerManagerClient();
-    manager->SetPowerManagerClient(make_scoped_ptr(power_manager_client_).
+    dbus_setter->SetPowerManagerClient(make_scoped_ptr(power_manager_client_).
         PassAs<chromeos::PowerManagerClient>());
-    chromeos::DBusThreadManager::InitializeForTesting(manager);
 #endif
     aura::test::AuraTestBase::SetUp();
     controller_.reset(new ShellDesktopController());