chrome/browser/chromeos/settings/device_settings_test_helper.cc - Issue 790183002: Revert of Call to CrosSettings::Set() is replaced by OwnerSettingsService::Set() in VersionUpda...

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 790183002: Revert of Call to CrosSettings::Set() is replaced by OwnerSettingsService::Set() in VersionUpda... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years 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_unittest.cc ('k') | chrome/browser/chromeos/settings/session_manager_operation_unittest.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.cc

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

index 3704edbbd272dafb89b0ceb054bf68173eea6f42..d30a4da7b7ae69154e4cdec77754d128800629f3 100644

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

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

@@ -256,7 +256,7 @@ void DeviceSettingsTestBase::InitOwner(const std::string& user_id,

const_cast<user_manager::User*>(user));

}

OwnerSettingsServiceChromeOS* service =

- OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get());

+ OwnerSettingsServiceChromeOSFactory::GetForProfile(profile_.get());

CHECK(service);

if (tpm_is_ready)

service->OnTPMTokenReady(true /* token is enabled */);