Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(911)

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
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 »

Powered by Google App Engine
This is Rietveld 408576698