Revert of Return GrGLContext from GrTestTarget

src/gpu/gl/GrGLGpu.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLGpu_DEFINED
 #define GrGLGpu_DEFINED
 
@@ skipping 91 matching lines @@
                      const SkIRect& srcRect,
                      const SkIPoint& dstPoint) override;
 
     void xferBarrier(GrRenderTarget*, GrXferBarrierType) override;
 
     void buildProgramDesc(GrProgramDesc*,
                           const GrPrimitiveProcessor&,
                           const GrPipeline&,
                           const GrBatchTracker&) const override;
 
-    const GrGLContext* glContextForTesting() const override {
-        return &this->glContext();
+    virtual const GrGLInterface* glInterfaceForTesting() const {
+        return this->glInterface();
     }
 
 private:
     GrGLGpu(GrGLContext* ctx, GrContext* context);
 
     // GrGpu overrides
     void onResetContext(uint32_t resetBits) override;
 
     GrTexture* onCreateTexture(const GrSurfaceDesc& desc, GrGpuResource::LifeCycle lifeCycle,
                                const void* srcData, size_t rowBytes) override;
@@ skipping 169 matching lines @@
     enum TempFBOTarget {
         kSrc_TempFBOTarget,
         kDst_TempFBOTarget
     };
 
     GrGLuint bindSurfaceAsFBO(GrSurface* surface, GrGLenum fboTarget, GrGLIRect* viewport,
                               TempFBOTarget tempFBOTarget);
 
     void unbindTextureFromFBO(GrGLenum fboTarget);
 
-    SkAutoTUnref<GrGLContext>  fGLContext;
+    SkAutoTDelete<GrGLContext>  fGLContext;
 
     void createCopyProgram();
 
     // GL program-related state
     ProgramCache*               fProgramCache;
 
     ///////////////////////////////////////////////////////////////////////////
     ///@name Caching of GL State
     ///@{
     int                         fHWActiveTextureUnitIdx;
@@ skipping 182 matching lines @@
 
     // we record what stencil format worked last time to hopefully exit early
     // from our loop that tries stencil formats and calls check fb status.
     int fLastSuccessfulStencilFmtIdx;
 
     typedef GrGpu INHERITED;
     friend class GrGLPathRendering; // For accessing setTextureUnit.
 };
 
 #endif