chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc - Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc

Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_test_helper.cc ('k') | chrome/browser/extensions/api/image_writer_private/test_utils.cc » ('j') | chromeos/dbus/dbus_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc

diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc

index 32310a2a89a38fc356ef2a9c6a4e4a38a4298cf1..9c0dbe96182ced5f241c509348238f8a31c8b5a8 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<DBusThreadManagerTestHelper> dbus_helper =

+ chromeos::DBusThreadManager::InitializeForTesting();

power_manager_client_ = new FakePowerManagerClient;

- dbus_manager->SetPowerManagerClient(

+ dbus_helper->SetPowerManagerClient(

scoped_ptr<PowerManagerClient>(power_manager_client_));

update_engine_client_ = new FakeUpdateEngineClient;

- dbus_manager->SetUpdateEngineClient(

+ dbus_helper->SetUpdateEngineClient(

scoped_ptr<UpdateEngineClient>(update_engine_client_));

- DBusThreadManager::InitializeForTesting(dbus_manager);

EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn())

.WillRepeatedly(ReturnPointee(&is_user_logged_in_));