chrome/browser/extensions/extension_action_icon_factory_unittest.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/extension_action_icon_factory_unittest.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/component_updater/recovery_component_installer.cc ('K') | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/extensions/extension_icon_manager_unittest.cc » ('j') | chromeos/network/onc/onc_test_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_action_icon_factory_unittest.cc

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

index 6af5c77082cd095b2283578d87f5f8ddebbef8aa..268d8dd68ee0ddc8ceff229cbdcd08fa720f2887 100644

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

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

@@ -109,10 +109,8 @@ class ExtensionActionIconFactoryTest

std::string error;

JSONFileValueDeserializer deserializer(

test_file.AppendASCII("manifest.json"));

- scoped_ptr<base::DictionaryValue> valid_value(

- static_cast<base::DictionaryValue*>(

- deserializer.Deserialize(&error_code,

- &error)));

+ scoped_ptr<base::DictionaryValue> valid_value =

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

Lei Zhang 2015/10/14 16:46:14 Didn't this use to pass in |error_code| instead of

EXPECT_EQ(0, error_code) << error;

if (error_code != 0)

return NULL;