mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef.

chrome/browser/extensions/api/system_info_storage/storage_info_provider_mac.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/system_info_storage/storage_info_provider.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOBSD.h>
 #include <IOKit/IOKitLib.h>
 #include <IOKit/storage/IOMedia.h>
@@ skipping 87 matching lines @@
                                         &media_iterator);
   if (retval != KERN_SUCCESS)
     return;
 
   base::mac::ScopedIOObject<io_iterator_t> iterator(media_iterator);
   media_iterator = IO_OBJECT_NULL;
 
   for (base::mac::ScopedIOObject<io_service_t> media(IOIteratorNext(iterator));
        media;
        media.reset(IOIteratorNext(iterator))) {
-    base::mac::ScopedCFTypeRef<CFTypeRef> dev_path_cf(
-        IORegistryEntryCreateCFProperty(media,
-                                        CFSTR(kIOBSDNameKey),
-                                        kCFAllocatorDefault,
-                                        0));
+    base::ScopedCFTypeRef<CFTypeRef> dev_path_cf(
+        IORegistryEntryCreateCFProperty(
+            media, CFSTR(kIOBSDNameKey), kCFAllocatorDefault, 0));
 
     if (!dev_path_cf)
       continue;
 
     std::string dev_path(_PATH_DEV);
     dev_path.append(
         base::SysCFStringRefToUTF8(
             base::mac::CFCast<CFStringRef>(dev_path_cf)));
 
-    base::mac::ScopedCFTypeRef<CFTypeRef> removable_cf(
-        IORegistryEntryCreateCFProperty(media,
-                                        CFSTR(kIOMediaEjectableKey),
-                                        kCFAllocatorDefault,
-                                        0));
+    base::ScopedCFTypeRef<CFTypeRef> removable_cf(
+        IORegistryEntryCreateCFProperty(
+            media, CFSTR(kIOMediaEjectableKey), kCFAllocatorDefault, 0));
     if (!removable_cf)
       dev_path_to_type_map_[dev_path] = systeminfo::kStorageTypeUnknown;
     else if (CFBooleanGetValue(base::mac::CFCast<CFBooleanRef>(removable_cf)))
       dev_path_to_type_map_[dev_path] = systeminfo::kStorageTypeRemovable;
     else
       dev_path_to_type_map_[dev_path] =  systeminfo::kStorageTypeFixed;
   }
 }
 
 }  // namespace
 
 // static
 StorageInfoProvider* StorageInfoProvider::Get() {
   return StorageInfoProvider::GetInstance<StorageInfoProviderMac>();
 }
 
 }  // namespace extensions