Move scoped_cftyperef from base to base/mac, use the new namespace, and name ...

app/surface/accelerated_surface_mac.h

 // Copyright (c) 2010 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.
 
 #ifndef APP_SURFACE_ACCELERATED_SURFACE_MAC_H_
 #define APP_SURFACE_ACCELERATED_SURFACE_MAC_H_
 #pragma once
 
 #include <CoreFoundation/CoreFoundation.h>
 
 #include "app/gfx/gl/gl_context.h"
 #include "app/surface/transport_dib.h"
 #include "base/callback.h"
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #include "base/scoped_ptr.h"
 #include "gfx/rect.h"
 #include "gfx/size.h"
 
 // Should not include GL headers in a header file. Forward declare these types
 // instead.
 typedef struct _CGLContextObject* CGLContextObj;
 typedef unsigned int GLenum;
 typedef unsigned int GLuint;
 
@@ skipping 98 matching lines @@
   // to the shared region (IOSurface or TransportDIB). Strictly
   // speaking, we do not need to allocate a GL context all of the
   // time. We only need one if (a) we are using the IOSurface code
   // path, or (b) if we are allocating an FBO internally.
   scoped_ptr<gfx::GLContext> gl_context_;
   // Either |io_surface_| or |transport_dib_| is a valid pointer, but not both.
   // |io_surface_| is non-NULL if the IOSurface APIs are supported (Mac OS X
   // 10.6 and later).
   // TODO(dspringer,kbr): Should the GPU backing store be encapsulated in its
   // own class so all this implementation detail is hidden?
-  scoped_cftyperef<CFTypeRef> io_surface_;
+  base::mac::ScopedCFTypeRef<CFTypeRef> io_surface_;
   // TODO(dspringer): If we end up keeping this TransportDIB mechanism, this
   // should really be a scoped_ptr_malloc<>, with a deallocate functor that
   // runs |dib_free_callback_|.  I was not able to figure out how to
   // make this work (or even compile).
   scoped_ptr<TransportDIB> transport_dib_;
   gfx::Size surface_size_;
   // TODO(kbr): the FBO management should not be in this class at all.
   // However, if it is factored out, care needs to be taken to not
   // introduce another copy of the color data on the GPU; the direct
   // binding of the internal texture to the IOSurface saves a copy.
   bool allocate_fbo_;
   // If the IOSurface code path is being used, then this texture
   // object is always allocated. Otherwise, it is only allocated if
   // the user requests an FBO be allocated.
   GLuint texture_;
   // The FBO and renderbuffer are only allocated if allocate_fbo_ is
   // true.
   GLuint fbo_;
   GLuint depth_stencil_renderbuffer_;
   // Allocate a TransportDIB in the renderer.
   scoped_ptr<Callback2<size_t, TransportDIB::Handle*>::Type>
       dib_alloc_callback_;
   scoped_ptr<Callback1<TransportDIB::Id>::Type> dib_free_callback_;
 };
 
 #endif  // APP_SURFACE_ACCELERATED_SURFACE_MAC_H_