| Index: chrome/browser/storage_monitor/storage_monitor_mac.mm
|
| diff --git a/chrome/browser/storage_monitor/storage_monitor_mac.mm b/chrome/browser/storage_monitor/storage_monitor_mac.mm
|
| index 9c5ca638c7fe805af9bc70a3a3e3608eb83c4213..20885a395b79f99c98a7df90787a99c212576b99 100644
|
| --- a/chrome/browser/storage_monitor/storage_monitor_mac.mm
|
| +++ b/chrome/browser/storage_monitor/storage_monitor_mac.mm
|
| @@ -74,7 +74,7 @@ StorageInfo BuildStorageInfo(
|
| dict, kDADiskDescriptionVolumeUUIDKey);
|
| std::string unique_id;
|
| if (uuid) {
|
| - base::mac::ScopedCFTypeRef<CFStringRef> uuid_string(
|
| + base::ScopedCFTypeRef<CFStringRef> uuid_string(
|
| CFUUIDCreateString(NULL, uuid));
|
| if (uuid_string.get())
|
| unique_id = base::SysCFStringRefToUTF8(uuid_string);
|
| @@ -105,7 +105,7 @@ StorageInfo BuildStorageInfo(
|
|
|
| void GetDiskInfoAndUpdateOnFileThread(
|
| const base::WeakPtr<StorageMonitorMac>& monitor,
|
| - base::mac::ScopedCFTypeRef<CFDictionaryRef> dict,
|
| + base::ScopedCFTypeRef<CFDictionaryRef> dict,
|
| StorageMonitorMac::UpdateType update_type) {
|
| DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
|
|
|
| @@ -125,7 +125,7 @@ void GetDiskInfoAndUpdateOnFileThread(
|
| struct EjectDiskOptions {
|
| std::string bsd_name;
|
| base::Callback<void(StorageMonitor::EjectStatus)> callback;
|
| - base::mac::ScopedCFTypeRef<DADiskRef> disk;
|
| + base::ScopedCFTypeRef<DADiskRef> disk;
|
| };
|
|
|
| void PostEjectCallback(DADiskRef disk,
|
| @@ -289,7 +289,7 @@ void StorageMonitorMac::EjectDevice(
|
|
|
| receiver()->ProcessDetach(device_id);
|
|
|
| - base::mac::ScopedCFTypeRef<DADiskRef> disk(
|
| + base::ScopedCFTypeRef<DADiskRef> disk(
|
| DADiskCreateFromBSDName(NULL, session_, bsd_name.c_str()));
|
| if (!disk.get()) {
|
| callback.Run(StorageMonitor::EJECT_FAILURE);
|
| @@ -337,12 +337,12 @@ void StorageMonitorMac::GetDiskInfoAndUpdate(
|
|
|
| pending_disk_updates_++;
|
|
|
| - base::mac::ScopedCFTypeRef<CFDictionaryRef> dict(DADiskCopyDescription(disk));
|
| + base::ScopedCFTypeRef<CFDictionaryRef> dict(DADiskCopyDescription(disk));
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::FILE,
|
| FROM_HERE,
|
| - base::Bind(GetDiskInfoAndUpdateOnFileThread,
|
| - AsWeakPtr(), dict, update_type));
|
| + base::Bind(
|
| + GetDiskInfoAndUpdateOnFileThread, AsWeakPtr(), dict, update_type));
|
| }
|
|
|
|
|
|
|