chrome/browser/extensions/extension_service_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_service_unittest.cc

Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/extensions/api/developer_private/extension_info_generator_unittest.cc ('K') | « chrome/browser/extensions/extension_icon_manager_unittest.cc ('k') | chrome/browser/extensions/external_pref_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_service_unittest.cc

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

index d22415f5b26632a8642e154cc987749f5f9fddbe..988470d2244cbe9943be2ce3751a75339fe948af 100644

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

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

@@ -364,14 +364,14 @@ class MockProviderVisitor

// We also parse the file into a dictionary to compare what we get back

// from the provider.

JSONStringValueDeserializer deserializer(json_data);

- base::Value* json_value = deserializer.Deserialize(NULL, NULL);

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

if (!json_value || !json_value->IsType(base::Value::TYPE_DICTIONARY)) {

NOTREACHED() << "Unable to deserialize json data";

return -1;

} else {

base::DictionaryValue* external_extensions =

- static_cast<base::DictionaryValue*>(json_value);

+ static_cast<base::DictionaryValue*>(json_value.release());

prefs_.reset(external_extensions);

}