Revert 87371 - Broke Compile - Support for glSetSurfaceCHROMIUM.

This command allows a previously created GPU surface to be made current for a command buffer. There are no surfaces registered at this point so this command is currently a no-op.
Review URL: http://codereview.chromium.org/7077001

TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/7027008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87373 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 9 deletions

diff --git a/content/gpu/gpu_info_collector.cc b/content/gpu/gpu_info_collector.cc
index 2e4630b..80c98fa 100644
--- a/content/gpu/gpu_info_collector.cc
+++ b/content/gpu/gpu_info_collector.cc
@@ -18,20 +18,20 @@
 
 namespace {
 
-scoped_refptr<gfx::GLSurface> InitializeGLSurface() {
-  scoped_refptr<gfx::GLSurface> surface(
-      gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1)));
+gfx::GLSurface* InitializeGLSurface() {
+  scoped_ptr<gfx::GLSurface> surface(gfx::GLSurface::CreateOffscreenGLSurface(
+      gfx::Size(1, 1)));
   if (!surface.get()) {
     LOG(ERROR) << "gfx::GLContext::CreateOffscreenGLSurface failed";
     return NULL;
   }
 
-  return surface;
+  return surface.release();
 }
 
-scoped_refptr<gfx::GLContext> InitializeGLContext(gfx::GLSurface* surface) {
+gfx::GLContext* InitializeGLContext(gfx::GLSurface* surface) {
 
-  scoped_refptr<gfx::GLContext> context(gfx::GLContext::CreateGLContext(NULL,
+  scoped_ptr<gfx::GLContext> context(gfx::GLContext::CreateGLContext(NULL,
                                                                      surface));
   if (!context.get()) {
     LOG(ERROR) << "gfx::GLContext::CreateGLContext failed";
@@ -43,7 +43,7 @@ scoped_refptr<gfx::GLContext> InitializeGLContext(gfx::GLSurface* surface) {
     return NULL;
   }
 
-  return context;
+  return context.release();
 }
 
 std::string GetGLString(unsigned int pname) {
@@ -84,11 +84,11 @@ bool CollectGraphicsInfoGL(GPUInfo* gpu_info) {
     return false;
   }
 
-  scoped_refptr<gfx::GLSurface> surface(InitializeGLSurface());
+  scoped_ptr<gfx::GLSurface> surface(InitializeGLSurface());
   if (!surface.get())
     return false;
 
-  scoped_refptr<gfx::GLContext> context(InitializeGLContext(surface.get()));
+  scoped_ptr<gfx::GLContext> context(InitializeGLContext(surface.get()));
   if (!context.get())
     return false;