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

Unified Diff: chrome/browser/chromeos/file_system_provider/service.h

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/service.h
diff --git a/chrome/browser/chromeos/file_system_provider/service.h b/chrome/browser/chromeos/file_system_provider/service.h
index e163a5b99f3449b7d28e09d7a46bcaecf9047f92..176b4c5344d7e36255169928845a7cdd1df88bcc 100644
--- a/chrome/browser/chromeos/file_system_provider/service.h
+++ b/chrome/browser/chromeos/file_system_provider/service.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_SERVICE_H_
#include <map>
+#include <memory>
#include <string>
#include <utility>
#include <vector>
@@ -14,7 +15,6 @@
#include "base/files/file_path.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/threading/thread_checker.h"
@@ -88,7 +88,7 @@ class Service : public KeyedService,
const FileSystemFactoryCallback& factory_callback);
// Sets a custom Registry implementation. Used by unit tests.
- void SetRegistryForTesting(scoped_ptr<RegistryInterface> registry);
+ void SetRegistryForTesting(std::unique_ptr<RegistryInterface> registry);
// Mounts a file system provided by an extension with the |extension_id|. If
// |writable| is set to true, then the file system is mounted in a R/W mode.
@@ -209,7 +209,7 @@ class Service : public KeyedService,
base::ObserverList<Observer> observers_;
ProvidedFileSystemMap file_system_map_; // Owns pointers.
MountPointNameToKeyMap mount_point_name_to_key_map_;
- scoped_ptr<RegistryInterface> registry_;
+ std::unique_ptr<RegistryInterface> registry_;
base::ThreadChecker thread_checker_;
base::WeakPtrFactory<Service> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698