Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1173)

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: 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/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') | Show Comments 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;
« no previous file with comments | « chrome/test/media_router/media_router_integration_browsertest.cc ('k') | chromecast/base/serializers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698