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

Unified Diff: chrome/browser/chromeos/file_system_provider/registry.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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/browser/chromeos/file_system_provider/registry.cc
diff --git a/chrome/browser/chromeos/file_system_provider/registry.cc b/chrome/browser/chromeos/file_system_provider/registry.cc
index be882e4a45a1cfb6a3a10fd989b26628fb8a68fa..fb6542ae78fcb53338462dbb8e658213347deb74 100644
--- a/chrome/browser/chromeos/file_system_provider/registry.cc
+++ b/chrome/browser/chromeos/file_system_provider/registry.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/chromeos/file_system_provider/registry.h"
#include "base/files/file_path.h"
+#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "chrome/browser/chromeos/file_system_provider/mount_path_util.h"
#include "chrome/browser/chromeos/file_system_provider/observer.h"
@@ -119,7 +120,7 @@ void Registry::ForgetFileSystem(const std::string& extension_id,
dict_update->Remove(extension_id, NULL);
}
-scoped_ptr<Registry::RestoredFileSystems> Registry::RestoreFileSystems(
+std::unique_ptr<Registry::RestoredFileSystems> Registry::RestoreFileSystems(
const std::string& extension_id) {
PrefService* const pref_service = profile_->GetPrefs();
DCHECK(pref_service);
@@ -131,10 +132,10 @@ scoped_ptr<Registry::RestoredFileSystems> Registry::RestoreFileSystems(
const base::DictionaryValue* file_systems_per_extension = NULL;
if (!file_systems->GetDictionaryWithoutPathExpansion(
extension_id, &file_systems_per_extension)) {
- return make_scoped_ptr(new RestoredFileSystems); // Nothing to restore.
+ return base::WrapUnique(new RestoredFileSystems); // Nothing to restore.
}
- scoped_ptr<RestoredFileSystems> restored_file_systems(
+ std::unique_ptr<RestoredFileSystems> restored_file_systems(
new RestoredFileSystems);
for (base::DictionaryValue::Iterator it(*file_systems_per_extension);

Powered by Google App Engine
This is Rietveld 408576698