Get real GPU memory values on NV+Linux and OS X

ui/gl/gl_context_mac.mm

 // 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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
-#include "base/memory/scoped_generic_obj.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context_cgl.h"
 #include "ui/gl/gl_context_osmesa.h"
 #include "ui/gl/gl_context_stub.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(USE_AURA)
 #include "ui/gl/gl_context_nsview.h"
 #endif
 
-namespace {
-
-// ScopedGenericObj functor for CGLDestroyRendererInfo().
-class ScopedDestroyRendererInfo {
- public:
-  void operator()(CGLRendererInfoObj x) const {
-    CGLDestroyRendererInfo(x);
-  }
-};
-
-}  // namespace
-
 namespace gfx {
 
 class GLShareGroup;
 
 scoped_refptr<GLContext> GLContext::CreateGLContext(
     GLShareGroup* share_group,
     GLSurface* compatible_surface,
     GpuPreference gpu_preference) {
   TRACE_EVENT0("gpu", "GLContext::CreateGLContext");
   switch (GetGLImplementation()) {
@@ skipping 65 matching lines @@
 
   bool found_online = false;
   bool found_offline = false;
 
   if (CGLQueryRendererInfo(display_mask,
                            &renderer_info,
                            &num_renderers) != kCGLNoError) {
     return false;
   }
 
-  ScopedGenericObj<CGLRendererInfoObj, ScopedDestroyRendererInfo>
-      scoper(renderer_info);
+  ScopedCGLRendererInfoObj scoper(renderer_info);
 
   for (GLint i = 0; i < num_renderers; ++i) {
     GLint accelerated = 0;
     if (CGLDescribeRenderer(renderer_info,
                             i,
                             kCGLRPAccelerated,
                             &accelerated) != kCGLNoError) {
       return false;
     }
 
@@ skipping 40 matching lines @@
       return false;
     }
 
     supports_dual_gpus = true;
   }
 
   return supports_dual_gpus;
 }
 
 }  // namespace gfx