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

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_test_helper.h ('k') | chrome/browser/chromeos/settings/session_manager_operation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index fed7034528326c12e993d53ebd398fbd7674ee26..24e588637001e31b1d4f9fd35806c5f900faf862 100644

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

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

@@ -197,8 +197,6 @@

: user_manager_(new FakeUserManager()),

user_manager_enabler_(user_manager_),

owner_key_util_(new ownership::MockOwnerKeyUtil()) {

- OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(

- &device_settings_service_);

OwnerSettingsServiceChromeOSFactory::GetInstance()->SetOwnerKeyUtilForTesting(

owner_key_util_);

}

@@ -220,11 +218,13 @@

device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());

device_settings_service_.SetSessionManager(&device_settings_test_helper_,

owner_key_util_);

+ OwnerSettingsServiceChromeOS::SetDeviceSettingsServiceForTesting(

+ &device_settings_service_);

profile_.reset(new TestingProfile());

}

void DeviceSettingsTestBase::TearDown() {

- OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(NULL);

+ OwnerSettingsServiceChromeOS::SetDeviceSettingsServiceForTesting(NULL);

FlushDeviceSettings();

device_settings_service_.UnsetSessionManager();

DBusThreadManager::Shutdown();