Merged FakedDBusThreadManager with DBusThreadManager.

ash/display/projecting_observer_chromeos_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 
 namespace ash {
 namespace {
 
 ui::TestDisplaySnapshot* CreateInternalSnapshot() {
   ui::TestDisplaySnapshot* output = new ui::TestDisplaySnapshot();
   output->set_type(ui::DISPLAY_CONNECTION_TYPE_INTERNAL);
@@ skipping 14 matching lines @@
     state.display = displays[i];
     outputs.push_back(state);
   }
 
   return outputs;
 }
 
 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() {
     chromeos::DBusThreadManager::Shutdown();
   }
 
  protected:
   scoped_ptr<ProjectingObserver> observer_;
   chromeos::FakePowerManagerClient* fake_power_client_;  //  Not owned.
 
@@ skipping 121 matching lines @@
 
   // Remove VGA output.
   outputs.erase(outputs.begin() + 1);
   observer_->OnDisplayModeChanged(outputs);
 
   EXPECT_EQ(2, fake_power_client_->num_set_is_projecting_calls());
   EXPECT_FALSE(fake_power_client_->is_projecting());
 }
 
 }  // namespace ash