Index: components/storage_monitor/storage_monitor_mac.h |
diff --git a/components/storage_monitor/storage_monitor_mac.h b/components/storage_monitor/storage_monitor_mac.h |
index 46a8af4f178773e92a1cddf7d529e4a9528567fc..cf690fec2ca7ce432b5aa15c8435012e84663d32 100644 |
--- a/components/storage_monitor/storage_monitor_mac.h |
+++ b/components/storage_monitor/storage_monitor_mac.h |
@@ -6,7 +6,9 @@ |
#define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_MAC_H_ |
#include <DiskArbitration/DiskArbitration.h> |
+ |
#include <map> |
+#include <memory> |
#include "base/mac/scoped_cftyperef.h" |
#include "base/macros.h" |
@@ -50,7 +52,7 @@ class StorageMonitorMac : public StorageMonitor, |
static void DiskDisappearedCallback(DADiskRef disk, void* context); |
static void DiskDescriptionChangedCallback(DADiskRef disk, |
CFArrayRef keys, |
- void *context); |
+ void* context); |
void GetDiskInfoAndUpdate(DADiskRef disk, UpdateType update_type); |
bool ShouldPostNotificationForDisk(const StorageInfo& info) const; |
@@ -65,7 +67,7 @@ class StorageMonitorMac : public StorageMonitor, |
int pending_disk_updates_; |
- scoped_ptr<ImageCaptureDeviceManager> image_capture_device_manager_; |
+ std::unique_ptr<ImageCaptureDeviceManager> image_capture_device_manager_; |
DISALLOW_COPY_AND_ASSIGN(StorageMonitorMac); |
}; |