components/update_client/component_patcher.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/update_client/component_patcher.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/policy/core/common/config_dir_policy_loader.cc ('k') | components/update_client/component_unpacker.cc » ('j') | extensions/browser/extension_icon_image_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/update_client/component_patcher.cc

diff --git a/components/update_client/component_patcher.cc b/components/update_client/component_patcher.cc

index 052588279030212cf90274dce54af603b3dbc16c..9105fda0849dcecb71fd7ccb8dde53bf36201991 100644

--- a/components/update_client/component_patcher.cc

+++ b/components/update_client/component_patcher.cc

@@ -31,7 +31,7 @@ base::ListValue* ReadCommands(const base::FilePath& unpack_path) {

return NULL;

JSONFileValueDeserializer deserializer(commands);

- scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, NULL));

+ scoped_ptr<base::Value> root = deserializer.Deserialize(NULL, NULL);

return (root.get() && root->IsType(base::Value::TYPE_LIST))

? static_cast<base::ListValue*>(root.release())