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

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

Issue 1899083002: Convert //chrome from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 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
Index: chrome/utility/importer/firefox_importer.cc
diff --git a/chrome/utility/importer/firefox_importer.cc b/chrome/utility/importer/firefox_importer.cc
index 6875290fdd44c06157b6b2be30d5ec5a87f72c26..cbeab3b9fa6d259d9a83ae3007bacab14919a387 100644
--- a/chrome/utility/importer/firefox_importer.cc
+++ b/chrome/utility/importer/firefox_importer.cc
@@ -4,13 +4,13 @@
#include "chrome/utility/importer/firefox_importer.h"
+#include <memory>
#include <set>
#include "base/files/file_enumerator.h"
#include "base/files/file_util.h"
#include "base/json/json_file_value_serializer.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
@@ -542,7 +542,7 @@ 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 =
+ std::unique_ptr<base::Value> metadata_root =
metadata_deserializer.Deserialize(NULL, NULL);
const base::DictionaryValue* search_metadata_root = NULL;
if (metadata_root)
@@ -554,7 +554,7 @@ void FirefoxImporter::GetSearchEnginesXMLDataFromJSON(
return;
JSONFileValueDeserializer deserializer(search_json_file);
- scoped_ptr<base::Value> root = deserializer.Deserialize(NULL, NULL);
+ std::unique_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/utility/importer/external_process_importer_bridge.h ('k') | chrome/utility/importer/firefox_importer_unittest_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698