From 29fe338316a08c2669d2e011889dff2b91dfb616 Mon Sep 17 00:00:00 2001 From: zelidrag Date: Tue, 26 Aug 2014 18:44:48 -0700 Subject: Part 3: Merged FakedDBusThreadManager with DBusThreadManager. BUG=401192 TEST=existing tests TBR=sky,stevenjb,keybuk Review URL: https://codereview.chromium.org/477663004 Cr-Commit-Position: refs/heads/master@{#292072} --- .../browser/chromeos/system/automatic_reboot_manager_unittest.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'chrome/browser/chromeos/system') diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc index 0c6334b..82744c5 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc +++ b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc @@ -33,7 +33,6 @@ #include "chrome/test/base/testing_browser_process.h" #include "chromeos/chromeos_paths.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_update_engine_client.h" #include "content/public/browser/browser_thread.h" @@ -357,14 +356,14 @@ void AutomaticRebootManagerBasicTest::SetUp() { TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_); AutomaticRebootManager::RegisterPrefs(local_state_.registry()); - FakeDBusThreadManager* dbus_manager = new FakeDBusThreadManager; + scoped_ptr dbus_setter = + chromeos::DBusThreadManager::GetSetterForTesting(); power_manager_client_ = new FakePowerManagerClient; - dbus_manager->SetPowerManagerClient( + dbus_setter->SetPowerManagerClient( scoped_ptr(power_manager_client_)); update_engine_client_ = new FakeUpdateEngineClient; - dbus_manager->SetUpdateEngineClient( + dbus_setter->SetUpdateEngineClient( scoped_ptr(update_engine_client_)); - DBusThreadManager::InitializeForTesting(dbus_manager); EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn()) .WillRepeatedly(ReturnPointee(&is_user_logged_in_)); -- cgit v1.1