chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc - Issue 1878143002: Convert //chrome/browser/supervised_user from scoped_ptr to std::unique_ptr

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/supervised_user/supervised_user_pref_store_unittest.cc

Issue 1878143002: Convert //chrome/browser/supervised_user from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary_unittest.cc ('K') | « chrome/browser/supervised_user/supervised_user_pref_store.cc ('k') | chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc

diff --git a/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc

index 7ac6b4d9f558ff686284d76d8b0104c0fac0eefd..f25f7366129c98f054ebf3b10637ce5fb2f1c8cd 100644

--- a/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc

+++ b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc

@@ -130,12 +130,11 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {

EXPECT_EQ(0u, fixture.changed_prefs()->size());

// kSupervisedModeManualHosts can be configured by the custodian.

- scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);

+ std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);

dict->SetBoolean("example.com", true);

dict->SetBoolean("moose.org", false);

- service_.SetLocalSetting(

- supervised_users::kContentPackManualBehaviorHosts,

- scoped_ptr<base::Value>(dict->DeepCopy()));

+ service_.SetLocalSetting(supervised_users::kContentPackManualBehaviorHosts,

+ std::unique_ptr<base::Value>(dict->DeepCopy()));

EXPECT_EQ(1u, fixture.changed_prefs()->size());

ASSERT_TRUE(fixture.changed_prefs()->GetDictionary(

prefs::kSupervisedUserManualHosts, &manual_hosts));

@@ -146,7 +145,7 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {

fixture.changed_prefs()->Clear();

service_.SetLocalSetting(

supervised_users::kForceSafeSearch,

- scoped_ptr<base::Value>(new base::FundamentalValue(false)));

+ std::unique_ptr<base::Value>(new base::FundamentalValue(false)));

EXPECT_EQ(1u, fixture.changed_prefs()->size());

EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceGoogleSafeSearch,

&force_google_safesearch));