components/policy/core/common/config_dir_policy_loader.cc - Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_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: components/policy/core/common/config_dir_policy_loader.cc

Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix and add ::From Created 5 years, 2 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

« chromeos/tools/onc_validator/onc_validator.cc ('K') | « components/omnibox/browser/search_suggestion_parser.cc ('k') | components/update_client/component_patcher.cc » ('j') | extensions/browser/extension_icon_image_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/policy/core/common/config_dir_policy_loader.cc

diff --git a/components/policy/core/common/config_dir_policy_loader.cc b/components/policy/core/common/config_dir_policy_loader.cc

index b81bfa99269badef3534e6e5f63a633f2ef215a2..daaf5415e320d6280a6327d16c92e06dc01a5ea5 100644

--- a/components/policy/core/common/config_dir_policy_loader.cc

+++ b/components/policy/core/common/config_dir_policy_loader.cc

@@ -143,8 +143,8 @@ void ConfigDirPolicyLoader::LoadFromPath(const base::FilePath& path,

deserializer.set_allow_trailing_comma(true);

int error_code = 0;

std::string error_msg;

- scoped_ptr<base::Value> value(

- deserializer.Deserialize(&error_code, &error_msg));

+ scoped_ptr<base::Value> value =

+ deserializer.Deserialize(&error_code, &error_msg);

if (!value.get()) {

LOG(WARNING) << "Failed to read configuration file "

<< config_file_iter->value() << ": " << error_msg;