chrome/browser/component_updater/recovery_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/recovery_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 todo about not failed trybot 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

« no previous file with comments | « chrome/browser/component_updater/pnacl_component_installer.cc ('k') | chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/component_updater/recovery_component_installer.cc

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

index 3657d6458dc7cc6f3c6ec177e04c57e3825b0800..8943ab4536b2e7d5d0cb44afccd040eb35472d94 100644

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

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

@@ -118,12 +118,7 @@ base::CommandLine GetRecoveryInstallCommandLine(

scoped_ptr<base::DictionaryValue> ReadManifest(const base::FilePath& manifest) {

JSONFileValueDeserializer deserializer(manifest);

std::string error;

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

- if (root.get() && root->IsType(base::Value::TYPE_DICTIONARY)) {

- return scoped_ptr<base::DictionaryValue>(

- static_cast<base::DictionaryValue*>(root.release()));

- }

- return scoped_ptr<base::DictionaryValue>();

+ return base::DictionaryValue::From(deserializer.Deserialize(NULL, &error));

}

void WaitForElevatedInstallToComplete(base::Process process) {