chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc - Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions

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

Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix bad merge Created 5 years, 7 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 | « cc/debug/invalidation_benchmark.cc ('k') | chrome/browser/extensions/api/settings_private/settings_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc

diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc

index cc287acaeefdd172e273d2f1a8ee6617ce53e261..6530914c5276ee1b744ee5e0d61eb8237f0ced97 100644

--- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc

+++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc

@@ -263,7 +263,7 @@ void NetworkConfigurationPolicyHandler::PrepareForDisplaying(

return;

base::Value* sanitized_config = SanitizeNetworkConfig(entry->value);

if (!sanitized_config)

- sanitized_config = base::Value::CreateNullValue();

+ sanitized_config = base::Value::CreateNullValue().release();

policies->Set(policy_name(), entry->level, entry->scope,

sanitized_config, NULL);

« no previous file with comments | « cc/debug/invalidation_benchmark.cc ('k') | chrome/browser/extensions/api/settings_private/settings_private_apitest.cc » ('j') | no next file with comments »