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

Unified Diff: chrome/utility/importer/firefox_importer.cc

Issue 925783002: Split ValueSerializer into separate Serializer and Deserializer classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed cpplint warnings. Created 5 years, 10 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/installer/util/uninstall_metrics_unittest.cc ('k') | chromeos/app_mode/kiosk_oem_manifest_parser.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 8e4aa727f9adec204648fd2e630ad25f2ce5331a..97c530a96da892423de68a73d72c03b67e3ec3e3 100644
--- a/chrome/utility/importer/firefox_importer.cc
+++ b/chrome/utility/importer/firefox_importer.cc
@@ -538,9 +538,9 @@ void FirefoxImporter::GetSearchEnginesXMLDataFromJSON(
// file exists only if the user has set keywords for search engines.
base::FilePath search_metadata_json_file =
source_path_.AppendASCII("search-metadata.json");
- JSONFileValueSerializer metadata_serializer(search_metadata_json_file);
+ JSONFileValueDeserializer metadata_deserializer(search_metadata_json_file);
scoped_ptr<base::Value> metadata_root(
- metadata_serializer.Deserialize(NULL, NULL));
+ metadata_deserializer.Deserialize(NULL, NULL));
const base::DictionaryValue* search_metadata_root = NULL;
if (metadata_root)
metadata_root->GetAsDictionary(&search_metadata_root);
@@ -550,8 +550,8 @@ void FirefoxImporter::GetSearchEnginesXMLDataFromJSON(
if (!base::PathExists(search_json_file))
return;
- JSONFileValueSerializer serializer(search_json_file);
- scoped_ptr<base::Value> root(serializer.Deserialize(NULL, NULL));
+ JSONFileValueDeserializer deserializer(search_json_file);
+ 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/installer/util/uninstall_metrics_unittest.cc ('k') | chromeos/app_mode/kiosk_oem_manifest_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698