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

chrome/common/mac/cfbundle_blocker.mm

 // Copyright (c) 2011 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/common/mac/cfbundle_blocker.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #import <Foundation/Foundation.h>
 
 #include "base/logging.h"
@@ skipping 138 matching lines @@
 _CFBundleLoadExecutableAndReturnError_Type
     g_original_underscore_cfbundle_load_executable_and_return_error;
 
 Boolean ChromeCFBundleLoadExecutableAndReturnError(CFBundleRef bundle,
                                                    Boolean force_global,
                                                    CFErrorRef* error) {
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
 
   DCHECK(g_original_underscore_cfbundle_load_executable_and_return_error);
 
-  base::mac::ScopedCFTypeRef<CFURLRef> url_cf(CFBundleCopyBundleURL(bundle));
+  base::ScopedCFTypeRef<CFURLRef> url_cf(CFBundleCopyBundleURL(bundle));
   scoped_nsobject<NSString> path(base::mac::CFToNSCast(
       CFURLCopyFileSystemPath(url_cf, kCFURLPOSIXPathStyle)));
 
   NSString* bundle_id = base::mac::CFToNSCast(CFBundleGetIdentifier(bundle));
 
   NSDictionary* bundle_dictionary =
       base::mac::CFToNSCast(CFBundleGetInfoDictionary(bundle));
   NSString* version = [bundle_dictionary objectForKey:
       base::mac::CFToNSCast(kCFBundleVersionKey)];
   if (![version isKindOfClass:[NSString class]]) {
     // Deal with pranksters.
     version = nil;
   }
 
   if (IsBundlePathBlocked(path) && !IsBundleAllowed(bundle_id, version)) {
     NSString* bundle_id_print = bundle_id ? bundle_id : @"(nil)";
     NSString* version_print = version ? version : @"(nil)";
 
     // Provide a hint for the user (or module developer) to figure out
     // that the bundle was blocked.
     LOG(INFO) << "Blocking attempt to load bundle "
               << [bundle_id_print UTF8String]
               << " version "
               << [version_print UTF8String]
               << " at "
               << [path fileSystemRepresentation];
 
     if (error) {
-      base::mac::ScopedCFTypeRef<CFStringRef> app_bundle_id(
+      base::ScopedCFTypeRef<CFStringRef> app_bundle_id(
           base::SysUTF8ToCFStringRef(base::mac::BaseBundleID()));
 
       // 0xb10c10ad = "block load"
       const CFIndex kBundleLoadBlocked = 0xb10c10ad;
 
       NSMutableDictionary* error_dict =
           [NSMutableDictionary dictionaryWithCapacity:4];
       if (bundle_id) {
         [error_dict setObject:bundle_id forKey:@"bundle_id"];
       }
@@ skipping 124 matching lines @@
     }
   }
 
   // Nothing matched.
   return false;
 }
 
 }  // namespace mac
 }  // namespace common
 }  // namespace chrome