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

Index: chrome/browser/extensions/extension_icon_manager_unittest.cc

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

index bcec7a810ac138c7fe6f4fa6be946189086570c7..3ca110414d59e11802a6a45e3b74d0ab6e022bdd 100644

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

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

@@ -109,9 +109,8 @@ TEST_F(ExtensionIconManagerTest, LoadRemoveLoad) {

"extensions/image_loading_tracker/app.json");

JSONFileValueDeserializer deserializer(manifest_path);

- scoped_ptr<base::DictionaryValue> manifest(

- static_cast<base::DictionaryValue*>(deserializer.Deserialize(NULL,

- NULL)));

+ scoped_ptr<base::DictionaryValue> manifest =

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

ASSERT_TRUE(manifest.get() != NULL);

std::string error;

@@ -152,9 +151,8 @@ TEST_F(ExtensionIconManagerTest, LoadComponentExtensionResource) {

"extensions/file_manager/app.json");