Merged FakedDBusThreadManager with DBusThreadManager.

ash/display/projecting_observer_chromeos_unittest.cc

Index: ash/display/projecting_observer_chromeos_unittest.cc
diff --git a/ash/display/projecting_observer_chromeos_unittest.cc b/ash/display/projecting_observer_chromeos_unittest.cc
index 3a72551a6442936762873aaf9e2ba84452a3b1b3..21885df09d874512c54a0a1cd2db5896f07d6d86 100644
--- a/ash/display/projecting_observer_chromeos_unittest.cc
+++ b/ash/display/projecting_observer_chromeos_unittest.cc
@@ -5,7 +5,7 @@
 #include "ash/display/projecting_observer_chromeos.h"
 
 #include "base/memory/scoped_vector.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/chromeos/test/test_display_snapshot.h"
@@ -40,15 +40,10 @@ ui::DisplayConfigurator::DisplayStateList CreateOutputs(
 class ProjectingObserverTest : public testing::Test {
  public:
   ProjectingObserverTest() : observer_(new ProjectingObserver()) {
-    chromeos::FakeDBusThreadManager* dbus_manager =
-        new chromeos::FakeDBusThreadManager();
     fake_power_client_ = new chromeos::FakePowerManagerClient();
 
-    dbus_manager->SetPowerManagerClient(
+    chromeos::DBusThreadManager::InitializeForTesting()->SetPowerManagerClient(

[hashimoto, 2014/08/25 06:56:19]

Does this compile?

         scoped_ptr<chromeos::PowerManagerClient>(fake_power_client_));
-
-    // Takes ownership of |dbus_manager|.
-    chromeos::DBusThreadManager::InitializeForTesting(dbus_manager);
   }
 
   virtual ~ProjectingObserverTest() {