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

rlz/mac/lib/machine_id_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 <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOKitLib.h>
 #include <IOKit/network/IOEthernetController.h>
 #include <IOKit/network/IOEthernetInterface.h>
 #include <IOKit/network/IONetworkInterface.h>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 
 namespace rlz_lib {
 
 namespace {
 
 // See http://developer.apple.com/library/mac/#technotes/tn1103/_index.html
 
 // The caller is responsible for freeing |matching_services|.
 bool FindEthernetInterfaces(io_iterator_t* matching_services) {
-  base::mac::ScopedCFTypeRef<CFMutableDictionaryRef> matching_dict(
+  base::ScopedCFTypeRef<CFMutableDictionaryRef> matching_dict(
       IOServiceMatching(kIOEthernetInterfaceClass));
   if (!matching_dict)
     return false;
 
-  base::mac::ScopedCFTypeRef<CFMutableDictionaryRef> primary_interface(
-      CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
+  base::ScopedCFTypeRef<CFMutableDictionaryRef> primary_interface(
+      CFDictionaryCreateMutable(kCFAllocatorDefault,
+                                0,
                                 &kCFTypeDictionaryKeyCallBacks,
                                 &kCFTypeDictionaryValueCallBacks));
   if (!primary_interface)
     return false;
 
   CFDictionarySetValue(
       primary_interface, CFSTR(kIOPrimaryInterface), kCFBooleanTrue);
   CFDictionarySetValue(
       matching_dict, CFSTR(kIOPropertyMatchKey), primary_interface);
 
@@ skipping 17 matching lines @@
     io_object_t primary_interface_parent;
     kern_return_t kern_result = IORegistryEntryGetParentEntry(
         primary_interface, kIOServicePlane, &primary_interface_parent);
     base::mac::ScopedIOObject<io_object_t> primary_interface_parent_deleter(
         primary_interface_parent);
     success = kern_result == KERN_SUCCESS;
 
     if (!success)
       continue;
 
-    base::mac::ScopedCFTypeRef<CFTypeRef> mac_data(
+    base::ScopedCFTypeRef<CFTypeRef> mac_data(
         IORegistryEntryCreateCFProperty(primary_interface_parent,
                                         CFSTR(kIOMACAddress),
                                         kCFAllocatorDefault,
                                         0));
     CFDataRef mac_data_data = base::mac::CFCast<CFDataRef>(mac_data);
     if (mac_data_data) {
       CFDataGetBytes(
           mac_data_data, CFRangeMake(0, kIOEthernetAddressSize), buffer);
     }
   }
@@ skipping 11 matching lines @@
   return result;
 }
 
 CFStringRef CopySerialNumber() {
   base::mac::ScopedIOObject<io_service_t> expert_device(
       IOServiceGetMatchingService(kIOMasterPortDefault,
           IOServiceMatching("IOPlatformExpertDevice")));
   if (!expert_device)
     return NULL;
 
-  base::mac::ScopedCFTypeRef<CFTypeRef> serial_number(
+  base::ScopedCFTypeRef<CFTypeRef> serial_number(
       IORegistryEntryCreateCFProperty(expert_device,
                                       CFSTR(kIOPlatformSerialNumberKey),
                                       kCFAllocatorDefault,
                                       0));
   CFStringRef serial_number_cfstring =
       base::mac::CFCast<CFStringRef>(serial_number);
   if (!serial_number_cfstring)
     return NULL;
 
   ignore_result(serial_number.release());
@@ skipping 23 matching lines @@
     CFRelease(serial);
   }
 
   // On windows, this is set to the volume id. Since it's not scrambled before
   // being sent, just set it to 1.
   *more_data = 1;
   return true;
 }
 
 }  // namespace rlz_lib