chrome/browser/extensions/component_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: chrome/browser/extensions/component_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 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/extensions/chrome_info_map_unittest.cc ('k') | chrome/browser/extensions/extension_action_icon_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/component_loader.cc

diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc

index 0f5aa98f2aa630da5a526d429dd278353e7aef6a..cdb717b2bab6988589b9799336ff14e247806b0e 100644

--- a/chrome/browser/extensions/component_loader.cc

+++ b/chrome/browser/extensions/component_loader.cc

@@ -164,7 +164,7 @@ void ComponentLoader::LoadAll() {

base::DictionaryValue* ComponentLoader::ParseManifest(

const std::string& manifest_contents) const {

JSONStringValueDeserializer deserializer(manifest_contents);

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

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

if (!manifest.get() || !manifest->IsType(base::Value::TYPE_DICTIONARY)) {

LOG(ERROR) << "Failed to parse extension manifest.";