chrome/browser/policy/javascript_policy_handler_unittest.cc - Issue 2334613003: Re-write many calls to WrapUnique() with MakeUnique()

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/policy/javascript_policy_handler_unittest.cc

Issue 2334613003: Re-write many calls to WrapUnique() with MakeUnique() (Closed)

Patch Set: Changes from review by sky Created 4 years, 3 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/policy/file_selection_dialogs_policy_handler_unittest.cc ('k') | chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/javascript_policy_handler_unittest.cc

diff --git a/chrome/browser/policy/javascript_policy_handler_unittest.cc b/chrome/browser/policy/javascript_policy_handler_unittest.cc

index d43e3523fa31c8246b4b504110e9af7f89ba067e..fee3293e5b5c52aa28fa90014c42771bb6e5ea20 100644

--- a/chrome/browser/policy/javascript_policy_handler_unittest.cc

+++ b/chrome/browser/policy/javascript_policy_handler_unittest.cc

@@ -29,12 +29,12 @@ TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabled) {

PolicyMap policy;

policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,

POLICY_SOURCE_CLOUD,

- base::WrapUnique(new base::FundamentalValue(true)), nullptr);

+ base::MakeUnique<base::FundamentalValue>(true), nullptr);

UpdateProviderPolicy(policy);

EXPECT_FALSE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));

policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,

POLICY_SOURCE_CLOUD,

- base::WrapUnique(new base::FundamentalValue(false)), nullptr);

+ base::MakeUnique<base::FundamentalValue>(false), nullptr);

UpdateProviderPolicy(policy);

const base::Value* value = NULL;

EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,

@@ -47,18 +47,17 @@ TEST_F(JavascriptPolicyHandlerTest, JavascriptEnabledOverridden) {

PolicyMap policy;

policy.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,

POLICY_SOURCE_CLOUD,

- base::WrapUnique(new base::FundamentalValue(false)), nullptr);

+ base::MakeUnique<base::FundamentalValue>(false), nullptr);

UpdateProviderPolicy(policy);

const base::Value* value = NULL;

EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,

&value));

EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_BLOCK).Equals(value));

// DefaultJavaScriptSetting overrides JavascriptEnabled.

- policy.Set(

- key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

- base::WrapUnique(new base::FundamentalValue(CONTENT_SETTING_ALLOW)),

- nullptr);

+ policy.Set(key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY,

+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,

+ base::MakeUnique<base::FundamentalValue>(CONTENT_SETTING_ALLOW),

+ nullptr);

UpdateProviderPolicy(policy);

EXPECT_TRUE(store_->GetValue(prefs::kManagedDefaultJavaScriptSetting,

&value));