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

Unified Diff: components/storage_monitor/storage_monitor.h

Issue 1884743002: Convert a few components from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lint 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: components/storage_monitor/storage_monitor.h
diff --git a/components/storage_monitor/storage_monitor.h b/components/storage_monitor/storage_monitor.h
index c3a2d9a2d7a380f78e75a03117f5bfbacece1831..5e8654abdeea61c35626cbbfeaf2cd4268a1b382 100644
--- a/components/storage_monitor/storage_monitor.h
+++ b/components/storage_monitor/storage_monitor.h
@@ -6,12 +6,12 @@
#define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_H_
#include <map>
+#include <memory>
#include <string>
#include <vector>
#include "base/callback.h"
#include "base/files/file_path.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list_threadsafe.h"
#include "base/strings/string16.h"
#include "base/synchronization/lock.h"
@@ -83,7 +83,7 @@ class StorageMonitor {
static StorageMonitor* GetInstance();
static void SetStorageMonitorForTesting(
- scoped_ptr<StorageMonitor> storage_monitor);
+ std::unique_ptr<StorageMonitor> storage_monitor);
virtual ~StorageMonitor();
@@ -169,7 +169,7 @@ class StorageMonitor {
void ProcessAttach(const StorageInfo& storage);
void ProcessDetach(const std::string& id);
- scoped_ptr<Receiver> receiver_;
+ std::unique_ptr<Receiver> receiver_;
scoped_refptr<base::ObserverListThreadSafe<RemovableStorageObserver>>
observer_list_;
@@ -187,7 +187,7 @@ class StorageMonitor {
// Map of all known storage devices,including fixed and removable storages.
StorageMap storage_map_;
- scoped_ptr<TransientDeviceIds> transient_device_ids_;
+ std::unique_ptr<TransientDeviceIds> transient_device_ids_;
};
} // namespace storage_monitor
« no previous file with comments | « components/storage_monitor/portable_device_watcher_win.cc ('k') | components/storage_monitor/storage_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698