Merged FakedDBusThreadManager with DBusThreadManager.

chrome/browser/chromeos/login/reset_browsertest.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 <string>
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/oobe_display.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/common/chrome_switches.h"
 #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"
 #include "content/public/test/browser_test_utils.h"
 
 namespace chromeos {
 
 namespace {
 
 const char kTestUser1[] = "test-user1@gmail.com";
 
 }  // namespace
 
 class ResetTest : public LoginManagerTest {
  public:
   ResetTest() : LoginManagerTest(false),
       update_engine_client_(NULL),
       session_manager_client_(NULL),
       power_manager_client_(NULL) {
   }
   virtual ~ResetTest() {}
 
   virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
     LoginManagerTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableRollbackOption);
   }
 
   // LoginManagerTest overrides:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    FakeDBusThreadManager* dbus_manager = new FakeDBusThreadManager;
-    dbus_manager->SetFakeClients();
+    scoped_ptr<DBusThreadManagerSetter> dbus_setter =
+        chromeos::DBusThreadManager::GetSetterForTesting();
     session_manager_client_ = new FakeSessionManagerClient;
-    dbus_manager->SetSessionManagerClient(
+    dbus_setter->SetSessionManagerClient(
         scoped_ptr<SessionManagerClient>(session_manager_client_));
     power_manager_client_ = new FakePowerManagerClient;
-    dbus_manager->SetPowerManagerClient(
+    dbus_setter->SetPowerManagerClient(
         scoped_ptr<PowerManagerClient>(power_manager_client_));
     update_engine_client_ = new FakeUpdateEngineClient;
-    dbus_manager->SetUpdateEngineClient(
+    dbus_setter->SetUpdateEngineClient(
         scoped_ptr<UpdateEngineClient>(update_engine_client_));
-    DBusThreadManager::SetInstanceForTesting(dbus_manager);
 
     LoginManagerTest::SetUpInProcessBrowserTestFixture();
   }
 
   void RegisterSomeUser() {
     RegisterUser(kTestUser1);
     StartupUtils::MarkOobeCompleted();
   }
 
   bool JSExecuted(const std::string& script) {
@@ skipping 183 matching lines @@
   UpdateEngineClient::Status ready_for_reboot_status;
   ready_for_reboot_status.status =
       UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT;
   update_engine_client_->NotifyObserversThatStatusChanged(
       ready_for_reboot_status);
   EXPECT_EQ(1, power_manager_client_->num_request_restart_calls());
 }
 
 
 }  // namespace chromeos