chrome/browser/component_updater/pnacl_component_installer.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: chrome/browser/component_updater/pnacl_component_installer.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

« chrome/browser/chromeos/app_mode/kiosk_external_updater.cc ('K') | « chrome/browser/component_updater/component_installers_unittest.cc ('k') | chrome/browser/component_updater/recovery_component_installer.cc » ('j') | chrome/browser/component_updater/recovery_component_installer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/component_updater/pnacl_component_installer.cc

diff --git a/chrome/browser/component_updater/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl_component_installer.cc

index 1198d60293c92bb4cca8450f919fc5dc5a8c2ecb..f10940ba5ecfadd3874bb7377743a49b976ce403 100644

--- a/chrome/browser/component_updater/pnacl_component_installer.cc

+++ b/chrome/browser/component_updater/pnacl_component_installer.cc

@@ -127,7 +127,7 @@ bool GetLatestPnaclDirectory(const scoped_refptr<PnaclComponentInstaller>& pci,

base::DictionaryValue* ReadJSONManifest(const base::FilePath& manifest_path) {

JSONFileValueDeserializer deserializer(manifest_path);

std::string error;

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

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

if (!root.get())

return NULL;

if (!root->IsType(base::Value::TYPE_DICTIONARY))