Revert of Revert of Return GrGLContext from GrTestTarget

src/gpu/GrTest.h

Index: src/gpu/GrTest.h
diff --git a/src/gpu/GrTest.h b/src/gpu/GrTest.h
index f1f3cf6c14dcf2cb554257eed84607605454130e..7e2ffed540bb7bb1d19998f74a9c27e1f4ede885 100644
--- a/src/gpu/GrTest.h
+++ b/src/gpu/GrTest.h
@@ -11,26 +11,26 @@
 
 #include "GrContext.h"
 #include "GrDrawTarget.h"
-#include "gl/GrGLInterface.h"
+#include "gl/GrGLContext.h"
 
 /** Allows a test to temporarily draw to a GrDrawTarget owned by a GrContext. Tests that use this
     should be careful not to mix using the GrDrawTarget directly and drawing via SkCanvas or
     GrContext. In the future this object may provide some guards to prevent this. */
 class GrTestTarget {
 public:
-    GrTestTarget() {};
+    GrTestTarget() : fGLContext(NULL) {};
 
-    void init(GrContext*, GrDrawTarget*, const GrGLInterface*);
+    void init(GrContext*, GrDrawTarget*, const GrGLContext*);
 
     GrDrawTarget* target() { return fDrawTarget.get(); }
 
-    /** Returns a GrGLInterface if the GrContext is backed by OpenGL. */
-    const GrGLInterface* glInterface() { return fGLInterface.get(); }
+    /** Returns a GrGLContext if the GrContext is backed by OpenGL. */
+    const GrGLContext* glContext() { return fGLContext; }
 
 private:
     SkAutoTUnref<GrDrawTarget>              fDrawTarget;
     SkAutoTUnref<GrContext>                 fContext;
-    SkAutoTUnref<const GrGLInterface>       fGLInterface;
+    SkAutoTUnref<const GrGLContext>         fGLContext;
 };
 
 #endif