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

base/ios/device_util.mm

 // 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 "base/ios/device_util.h"
 
 #include <CommonCrypto/CommonDigest.h>
 #import <UIKit/UIKit.h>
 
 #include <ifaddrs.h>
@@ skipping 101 matching lines @@
         }
         break;
       }
     }
     freeifaddrs(addresses);
   }
   return mac_string;
 }
 
 std::string GetRandomId() {
-  base::mac::ScopedCFTypeRef<CFUUIDRef>
-      uuid_object(CFUUIDCreate(kCFAllocatorDefault));
-  base::mac::ScopedCFTypeRef<CFStringRef> uuid_string(
+  base::ScopedCFTypeRef<CFUUIDRef> uuid_object(
+      CFUUIDCreate(kCFAllocatorDefault));
+  base::ScopedCFTypeRef<CFStringRef> uuid_string(
       CFUUIDCreateString(kCFAllocatorDefault, uuid_object));
   return base::SysCFStringRefToUTF8(uuid_string);
 }
 
 std::string GetDeviceIdentifier(const char* salt) {
   NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
 
   NSString* last_seen_hardware =
       [defaults stringForKey:kHardwareTypePreferenceKey];
   NSString* current_hardware = base::SysUTF8ToNSString(GetPlatform());
@@ skipping 12 matching lines @@
     [defaults synchronize];
   }
 
   NSData* hash_data = [[NSString stringWithFormat:@"%@%s", client_id,
       salt ? salt : kDefaultSalt] dataUsingEncoding:NSUTF8StringEncoding];
 
   unsigned char hash[CC_SHA256_DIGEST_LENGTH];
   CC_SHA256([hash_data bytes], [hash_data length], hash);
   CFUUIDBytes* uuid_bytes = reinterpret_cast<CFUUIDBytes*>(hash);
 
-  base::mac::ScopedCFTypeRef<CFUUIDRef>
-      uuid_object(CFUUIDCreateFromUUIDBytes(kCFAllocatorDefault, *uuid_bytes));
-  base::mac::ScopedCFTypeRef<CFStringRef> device_id(
+  base::ScopedCFTypeRef<CFUUIDRef> uuid_object(
+      CFUUIDCreateFromUUIDBytes(kCFAllocatorDefault, *uuid_bytes));
+  base::ScopedCFTypeRef<CFStringRef> device_id(
       CFUUIDCreateString(kCFAllocatorDefault, uuid_object));
   return base::SysCFStringRefToUTF8(device_id);
 }
 
 }  // namespace device_util
 }  // namespace ios