chrome/browser/chromeos/settings/device_settings_service_unittest.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_service_unittest.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/ownership/owner_settings_service_chromeos_unittest.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_service_unittest.cc

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

index dfc9b92a506d4f63fabdd05b7761cfb7d1244499..5e5d2a4ca8decd0b9fb470203ecc307275be3f9f 100644

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

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

@@ -269,7 +269,7 @@ TEST_F(DeviceSettingsServiceTest, OnTPMTokenReadyForNonOwner) {

const std::string& user_id = device_policy_.policy_data().username();

InitOwner(user_id, false);

OwnerSettingsServiceChromeOS* service =

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

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

ASSERT_TRUE(service);

service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner,

base::Unretained(this)));

@@ -314,7 +314,7 @@ TEST_F(DeviceSettingsServiceTest, OwnerPrivateKeyInTPMToken) {

owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());

InitOwner(user_id, false);

OwnerSettingsServiceChromeOS* service =

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

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

ASSERT_TRUE(service);

ReloadDeviceSettings();

@@ -350,7 +350,7 @@ TEST_F(DeviceSettingsServiceTest, OnTPMTokenReadyForOwner) {

owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());

InitOwner(user_id, false);

OwnerSettingsServiceChromeOS* service =

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

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

ASSERT_TRUE(service);

service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner,

base::Unretained(this)));

@@ -407,7 +407,7 @@ TEST_F(DeviceSettingsServiceTest, IsCurrentUserOwnerAsyncWithLoadedCerts) {

EXPECT_FALSE(is_owner_set_);

OwnerSettingsServiceChromeOS* service =

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

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

ASSERT_TRUE(service);

service->IsOwnerAsync(base::Bind(&DeviceSettingsServiceTest::OnIsOwner,

base::Unretained(this)));