Cleanup: Remove ScopedGenericObj. Use scoped_ptr<type, CustomDeleter> instead.

ui/gl/gl_context_cgl.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/gl/gl_context_cgl.h"
 
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/CGLTypes.h>
 #include <vector>
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_cgl.h"
 #include "ui/gl/gpu_switching_manager.h"
 
 namespace gfx {
 
+namespace {
+
 bool g_support_renderer_switching;
 
+struct CGLRendererInfoObjDeleter {
+  void operator()(CGLRendererInfoObj* x) {
+    if (x)
+      CGLDestroyRendererInfo(*x);
+  }
+};
+
+}  // namespace
+
 static CGLPixelFormatObj GetPixelFormat() {
   static CGLPixelFormatObj format;
   if (format)
     return format;
   std::vector<CGLPixelFormatAttribute> attribs;
   // If the system supports dual gpus then allow offline renderers for every
   // context, so that they can all be in the same share group.
   if (ui::GpuSwitchingManager::GetInstance()->SupportsDualGpus()) {
     attribs.push_back(kCGLPFAAllowOfflineRenderers);
     g_support_renderer_switching = true;
@@ skipping 206 matching lines @@
 
   // Iterate through the list of all renderers
   GLuint display_mask = static_cast<GLuint>(-1);
   CGLRendererInfoObj renderer_info = NULL;
   GLint num_renderers = 0;
   if (CGLQueryRendererInfo(display_mask,
                            &renderer_info,
                            &num_renderers) != kCGLNoError)
     return false;
 
-  ScopedCGLRendererInfoObj scoper(renderer_info);
+  scoped_ptr<CGLRendererInfoObj,
+      CGLRendererInfoObjDeleter> scoper(&renderer_info);
 
   for (GLint renderer_index = 0;
        renderer_index < num_renderers;
        ++renderer_index) {
     // Skip this if this renderer is not the current renderer.
     GLint renderer_id = 0;
     if (CGLDescribeRenderer(renderer_info,
                             renderer_index,
                             kCGLRPRendererID,
                             &renderer_id) != kCGLNoError)
@@ skipping 20 matching lines @@
 
 
 GLContextCGL::~GLContextCGL() {
   Destroy();
 }
 
 GpuPreference GLContextCGL::GetGpuPreference() {
   return gpu_preference_;
 }
 
-void ScopedCGLDestroyRendererInfo::operator()(CGLRendererInfoObj x) const {
-  CGLDestroyRendererInfo(x);
-}
-
 }  // namespace gfx