chrome/browser/chromeos/settings/device_settings_test_helper.h - Issue 640063008: Revert of Implemented OwnerSettingsService::Set() method.

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 640063008: Revert of Implemented OwnerSettingsService::Set() method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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_service.cc ('k') | chrome/browser/chromeos/settings/device_settings_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 8100563216d354e6dea5c4ffb13c525d05f2b58b..cac6fc9580ae9ca0c7f2ea436f69fe112198b163 100644

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

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

@@ -185,11 +185,11 @@

// tested classes depend on implicitly.

FakeUserManager* user_manager_;

ScopedUserManagerEnabler user_manager_enabler_;

+ scoped_ptr<TestingProfile> profile_;

scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_;

// Local DeviceSettingsService instance for tests. Avoid using in combination

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

DeviceSettingsService device_settings_service_;

- scoped_ptr<TestingProfile> profile_;

scoped_ptr<DBusThreadManagerSetter> dbus_setter_;