chrome/browser/chromeos/settings/device_settings_test_helper.h - 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/settings/device_settings_test_helper.h

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:

Index: chrome/browser/chromeos/settings/device_settings_test_helper.h

diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h

index fc66da9a8679c8ef59c8fb9263d225f58555fff9..a01fb9f8f14a235fc9ff259f99fe35f86862c25d 100644

--- a/chrome/browser/chromeos/settings/device_settings_test_helper.h

+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h

@@ -29,7 +29,7 @@ class TestingProfile;

namespace chromeos {

-class FakeDBusThreadManager;

+class DBusThreadManagerSetter;

// A helper class for tests mocking out session_manager's device settings

// interface. The pattern is to initialize DeviceSettingsService with the helper

@@ -194,7 +194,7 @@ class DeviceSettingsTestBase : public testing::Test {

// with the global instance (DeviceSettingsService::Get()).

DeviceSettingsService device_settings_service_;

- chromeos::FakeDBusThreadManager* fake_dbus_thread_manager_;

+ scoped_ptr<DBusThreadManagerSetter> dbus_setter_;

private:

DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);