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

content/browser/gamepad/xbox_data_fetcher_mac.cc

 // Copyright 2013 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 "content/browser/gamepad/xbox_data_fetcher_mac.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
@@ skipping 477 matching lines @@
     }
   }
 }
 
 void XboxDataFetcher::DeviceRemoved(void* context, io_iterator_t iterator) {
   DCHECK(context);
   XboxDataFetcher* fetcher = static_cast<XboxDataFetcher*>(context);
   io_service_t ref;
   while ((ref = IOIteratorNext(iterator))) {
     base::mac::ScopedIOObject<io_service_t> scoped_ref(ref);
-    base::mac::ScopedCFTypeRef<CFNumberRef> number(
-        base::mac::CFCastStrict<CFNumberRef>(IORegistryEntryCreateCFProperty(
-            ref,
-            CFSTR(kUSBDevicePropertyLocationID),
-            kCFAllocatorDefault,
-            kNilOptions)));
+    base::ScopedCFTypeRef<CFNumberRef> number(
+        base::mac::CFCastStrict<CFNumberRef>(
+            IORegistryEntryCreateCFProperty(ref,
+                                            CFSTR(kUSBDevicePropertyLocationID),
+                                            kCFAllocatorDefault,
+                                            kNilOptions)));
     UInt32 location_id = 0;
     CFNumberGetValue(number, kCFNumberSInt32Type, &location_id);
     fetcher->RemoveControllerByLocationID(location_id);
   }
 }
 
 bool XboxDataFetcher::RegisterForNotifications() {
   if (listening_)
     return true;
-  base::mac::ScopedCFTypeRef<CFNumberRef> vendor_cf(
-      CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type,
-                     &kVendorMicrosoft));
-  base::mac::ScopedCFTypeRef<CFNumberRef> product_cf(
-      CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type,
-                     &kProduct360Controller));
-  base::mac::ScopedCFTypeRef<CFMutableDictionaryRef> matching_dict(
+  base::ScopedCFTypeRef<CFNumberRef> vendor_cf(CFNumberCreate(
+      kCFAllocatorDefault, kCFNumberSInt32Type, &kVendorMicrosoft));
+  base::ScopedCFTypeRef<CFNumberRef> product_cf(CFNumberCreate(
+      kCFAllocatorDefault, kCFNumberSInt32Type, &kProduct360Controller));
+  base::ScopedCFTypeRef<CFMutableDictionaryRef> matching_dict(
       IOServiceMatching(kIOUSBDeviceClassName));
   if (!matching_dict)
     return false;
   CFDictionarySetValue(matching_dict, CFSTR(kUSBVendorID), vendor_cf);
   CFDictionarySetValue(matching_dict, CFSTR(kUSBProductID), product_cf);
   port_ = IONotificationPortCreate(kIOMasterPortDefault);
   if (!port_)
     return false;
   source_ = IONotificationPortGetRunLoopSource(port_);
   if (!source_)
@@ skipping 88 matching lines @@
 }
 
 void XboxDataFetcher::XboxControllerGotData(XboxController* controller,
                                             const XboxController::Data& data) {
   delegate_->XboxValueChanged(controller, data);
 }
 
 void XboxDataFetcher::XboxControllerError(XboxController* controller) {
   RemoveController(controller);
 }