diff options
| author | zelidrag <zelidrag@chromium.org> | 2014-08-26 18:44:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-27 01:45:47 +0000 |
| commit | 29fe338316a08c2669d2e011889dff2b91dfb616 (patch) | |
| tree | b4b49dbe5a9eae924bee60892b2bdda369b440cc /chrome/browser/chromeos/system | |
| parent | 71d115dac733c9532ab73c9e521f1ab545304d14 (diff) | |
| download | chromium_src-29fe338316a08c2669d2e011889dff2b91dfb616.zip chromium_src-29fe338316a08c2669d2e011889dff2b91dfb616.tar.gz chromium_src-29fe338316a08c2669d2e011889dff2b91dfb616.tar.bz2 | |
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}
Diffstat (limited to 'chrome/browser/chromeos/system')
| -rw-r--r-- | chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc | 9 |
1 files changed, 4 insertions, 5 deletions
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<DBusThreadManagerSetter> dbus_setter = + chromeos::DBusThreadManager::GetSetterForTesting(); 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::InitializeForTesting(dbus_manager); EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn()) .WillRepeatedly(ReturnPointee(&is_user_logged_in_)); |