GLContext no longer holds a pointer to a GLSurface.

media/tools/shader_bench/shader_bench.cc

 // Copyright (c) 2011 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 <deque>
 #include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "base/at_exit.h"
@@ skipping 117 matching lines @@
   // Process files.
   std::deque<scoped_refptr<media::VideoFrame> > frames;
   GetFrames(file_name, width, height, num_frames, frames);
 
   // Initialize window and graphics context.
   base::AtExitManager at_exit_manager;
   gfx::GLSurface::InitializeOneOff();
   scoped_ptr<media::Window> window(new media::Window(width, height));
   gfx::GLSurface* surface =
       gfx::GLSurface::CreateViewGLSurface(window->PluginWindow());
-  gfx::GLContext* context = gfx::GLContext::CreateGLContext(surface, NULL);
-  context->MakeCurrent();
+  gfx::GLContext* context = gfx::GLContext::CreateGLContext(NULL);
+  context->MakeCurrent(surface);
   // This sets D3DPRESENT_INTERVAL_IMMEDIATE on Windows.
   context->SetSwapInterval(0);
 
   // Initialize and name GPU painters.
   static const int kNumPainters = 3;
   static const struct {
     const char* name;
     GPUPainter* painter;
   } painters[] = {
     { "CPU CSC + GPU Render", new CPUColorPainter() },
     { "GPU CSC/Render", new GPUColorWithLuminancePainter() },
     { "GPU CSC/Render (experimental)", new GPUColorRGBALumHackPainter() },
   };
 
   // Run GPU painter tests.
   for (int i = 0; i < kNumPainters; i++) {
     scoped_ptr<GPUPainter> painter(painters[i].painter);
     painter->LoadFrames(&frames);
-    painter->SetGLContext(context);
+    painter->SetGLContext(surface, context);
     painter->Initialize(width, height);
     printf("Running %s tests...", painters[i].name);
     RunTest(window.get(), painter.get());
   }
 
   return 0;
 }