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

base/native_library_mac.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 "base/native_library.h"
 
 #include <dlfcn.h>
 #include <mach-o/getsect.h>
 
 #include "base/file_util.h"
@@ skipping 38 matching lines @@
       !file_util::DirectoryExists(library_path)) {
     void* dylib = dlopen(library_path.value().c_str(), RTLD_LAZY);
     if (!dylib)
       return NULL;
     NativeLibrary native_lib = new NativeLibraryStruct();
     native_lib->type = DYNAMIC_LIB;
     native_lib->dylib = dylib;
     native_lib->objc_status = OBJC_UNKNOWN;
     return native_lib;
   }
-  base::mac::ScopedCFTypeRef<CFURLRef> url(
-      CFURLCreateFromFileSystemRepresentation(
-          kCFAllocatorDefault,
-          (const UInt8*)library_path.value().c_str(),
-          library_path.value().length(),
-          true));
+  base::ScopedCFTypeRef<CFURLRef> url(CFURLCreateFromFileSystemRepresentation(
+      kCFAllocatorDefault,
+      (const UInt8*)library_path.value().c_str(),
+      library_path.value().length(),
+      true));
   if (!url)
     return NULL;
   CFBundleRef bundle = CFBundleCreate(kCFAllocatorDefault, url.get());
   if (!bundle)
     return NULL;
 
   NativeLibrary native_lib = new NativeLibraryStruct();
   native_lib->type = BUNDLE;
   native_lib->bundle = bundle;
   native_lib->bundle_resource_ref = CFBundleOpenBundleResourceMap(bundle);
@@ skipping 21 matching lines @@
   delete library;
 }
 
 // static
 void* GetFunctionPointerFromNativeLibrary(NativeLibrary library,
                                           const char* name) {
   void* function_pointer = NULL;
 
   // Get the function pointer using the right API for the type.
   if (library->type == BUNDLE) {
-    base::mac::ScopedCFTypeRef<CFStringRef> symbol_name(
-        CFStringCreateWithCString(kCFAllocatorDefault, name,
-                                  kCFStringEncodingUTF8));
+    base::ScopedCFTypeRef<CFStringRef> symbol_name(CFStringCreateWithCString(
+        kCFAllocatorDefault, name, kCFStringEncodingUTF8));
     function_pointer = CFBundleGetFunctionPointerForName(library->bundle,
                                                          symbol_name);
   } else {
     function_pointer = dlsym(library->dylib, name);
   }
 
   // If this library hasn't been tested for having ObjC, use the function
   // pointer to look up the section information for the library.
   if (function_pointer && library->objc_status == OBJC_UNKNOWN)
     library->objc_status = GetObjCStatusForImage(function_pointer);
 
   return function_pointer;
 }
 
 // static
 string16 GetNativeLibraryName(const string16& name) {
   return name + ASCIIToUTF16(".dylib");
 }
 
 }  // namespace base