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

ui/surface/accelerated_surface_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 "ui/surface/accelerated_surface_mac.h"
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "ui/gfx/rect.h"
 #include "ui/gl/gl_bindings.h"
@@ skipping 98 matching lines @@
 static void AddBooleanValue(CFMutableDictionaryRef dictionary,
                             const CFStringRef key,
                             bool value) {
   CFDictionaryAddValue(dictionary, key,
                        (value ? kCFBooleanTrue : kCFBooleanFalse));
 }
 
 static void AddIntegerValue(CFMutableDictionaryRef dictionary,
                             const CFStringRef key,
                             int32 value) {
-  base::mac::ScopedCFTypeRef<CFNumberRef> number(
+  base::ScopedCFTypeRef<CFNumberRef> number(
       CFNumberCreate(NULL, kCFNumberSInt32Type, &value));
   CFDictionaryAddValue(dictionary, key, number.get());
 }
 
 // Creates a new OpenGL texture object bound to the given texture target.
 // Caller owns the returned texture.
 static GLuint CreateTexture(GLenum target) {
   GLuint texture = 0;
   glGenTextures(1, &texture);
   glBindTexture(target, texture);
@@ skipping 78 matching lines @@
   GLenum target = GL_TEXTURE_RECTANGLE_ARB;
   if (allocate_fbo_) {
     AllocateRenderBuffers(target, clamped_size);
   } else if (!texture_) {
     // Generate the texture object.
     texture_ = CreateTexture(target);
   }
 
   // Allocate a new IOSurface, which is the GPU resource that can be
   // shared across processes.
-  base::mac::ScopedCFTypeRef<CFMutableDictionaryRef> properties;
+  base::ScopedCFTypeRef<CFMutableDictionaryRef> properties;
   properties.reset(CFDictionaryCreateMutable(kCFAllocatorDefault,
                                              0,
                                              &kCFTypeDictionaryKeyCallBacks,
                                              &kCFTypeDictionaryValueCallBacks));
   AddIntegerValue(properties,
                   io_surface_support->GetKIOSurfaceWidth(),
                   clamped_size.width());
   AddIntegerValue(properties,
                   io_surface_support->GetKIOSurfaceHeight(),
                   clamped_size.height());
@@ skipping 37 matching lines @@
   // make our IOSurfaces global and send back their identifiers. On
   // the browser process side the identifier is reconstituted into an
   // IOSurface for on-screen rendering.
   io_surface_id_ = io_surface_support->IOSurfaceGetID(io_surface_);
   return io_surface_id_;
 }
 
 uint32 AcceleratedSurface::GetSurfaceId() {
   return io_surface_id_;
 }