chrome/utility/importer/firefox_importer.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/utility/importer/firefox_importer.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/test/media_router/media_router_integration_browsertest.cc ('k') | chromecast/base/serializers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/utility/importer/firefox_importer.cc

diff --git a/chrome/utility/importer/firefox_importer.cc b/chrome/utility/importer/firefox_importer.cc

index b9238d6085237b569e01569c1d63ab07999880f7..f945fb3c1c21ff7c3bdd330ffb9946e250edbf0e 100644

--- a/chrome/utility/importer/firefox_importer.cc

+++ b/chrome/utility/importer/firefox_importer.cc

@@ -541,8 +541,8 @@ void FirefoxImporter::GetSearchEnginesXMLDataFromJSON(

base::FilePath search_metadata_json_file =

source_path_.AppendASCII("search-metadata.json");

JSONFileValueDeserializer metadata_deserializer(search_metadata_json_file);

- scoped_ptr<base::Value> metadata_root(

- metadata_deserializer.Deserialize(NULL, NULL));

+ scoped_ptr<base::Value> metadata_root =

+ metadata_deserializer.Deserialize(NULL, NULL);

const base::DictionaryValue* search_metadata_root = NULL;

if (metadata_root)

metadata_root->GetAsDictionary(&search_metadata_root);

@@ -553,7 +553,7 @@ void FirefoxImporter::GetSearchEnginesXMLDataFromJSON(

return;

JSONFileValueDeserializer deserializer(search_json_file);

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

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

const base::DictionaryValue* search_root = NULL;

if (!root || !root->GetAsDictionary(&search_root))

return;