Remove GL-specific code from GMs and tests

bench/GLBench.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GLBench.h"
 
 #if SK_SUPPORT_GPU
 #include "GrTest.h"
 #include <stdio.h>
 
 const GrGLContext* GLBench::getGLContext(SkCanvas* canvas) {
     // This bench exclusively tests GL calls directly
     if (NULL == canvas->getGrContext()) {
         return NULL;
     }
     GrContext* context = canvas->getGrContext();
-
-    GrTestTarget tt;
-    context->getTestTarget(&tt);
-    if (!tt.target()) {
-        SkDebugf("Couldn't get Gr test target.");
+    GrGpu* gpu = context->getGpu();
+    if (!gpu) {
+        SkDebugf("Couldn't get Gr gpu.");
         return NULL;
     }
 
-    const GrGLContext* ctx = tt.glContext();
+    const GrGLContext* ctx = gpu->glContextForTesting();
     if (!ctx) {
         SkDebugf("Couldn't get an interface\n");
         return NULL;
     }
 
     return this->onGetGLContext(ctx);
 }
 
 void GLBench::onPerCanvasPreDraw(SkCanvas* canvas) {
     // This bench exclusively tests GL calls directly
@@ skipping 126 matching lines @@
     bm.setPixels(readback.get());
 
     if (!SkImageEncoder::EncodeFile(filename, bm, SkImageEncoder::kPNG_Type, 100)) {
         SkDebugf("------ failed to encode %s\n", filename);
         remove(filename);   // remove any partial file
         return;
     }
 }
 
 #endif