GLContext no longer holds a pointer to a GLSurface.

media/tools/shader_bench/gpu_painter.cc

Index: media/tools/shader_bench/gpu_painter.cc
===================================================================
--- media/tools/shader_bench/gpu_painter.cc	(revision 86168)
+++ media/tools/shader_bench/gpu_painter.cc	(working copy)
@@ -25,13 +25,16 @@
 static const unsigned int kErrorSize = 4096;
 
 GPUPainter::GPUPainter()
-    : context_(NULL) {
+    : surface_(NULL),
+      context_(NULL) {
 }
 
 GPUPainter::~GPUPainter() {
 }
 
-void GPUPainter::SetGLContext(gfx::GLContext* context) {
+void GPUPainter::SetGLContext(gfx::GLSurface* surface,
+                              gfx::GLContext* context) {
+  surface_ = surface;
   context_ = context;
 }