Use GLES2Interface for shaders and programs

cc/test/test_context_provider.h

Index: cc/test/test_context_provider.h
diff --git a/cc/test/test_context_provider.h b/cc/test/test_context_provider.h
index 81167c6f539a93ee595bd03312acffe067f92325..7b9b20abb25c00ce238e4569191cfe787adf2765 100644
--- a/cc/test/test_context_provider.h
+++ b/cc/test/test_context_provider.h
@@ -17,6 +17,7 @@ namespace blink { class WebGraphicsContext3D; }
 
 namespace cc {
 class TestWebGraphicsContext3D;
+class TestGLES2Interface;
 
 class TestContextProvider : public cc::ContextProvider {
  public:
@@ -64,7 +65,7 @@ class TestContextProvider : public cc::ContextProvider {
   TestContextSupport support_;
 
   scoped_ptr<TestWebGraphicsContext3D> context3d_;
-  gpu::gles2::GLES2InterfaceStub context_gl_stub_;
+  scoped_ptr<TestGLES2Interface> context_gl_;
   bool bound_;
 
   base::ThreadChecker main_thread_checker_;