Make the debug interface a GrGLTestInterface subclass.

src/gpu/gl/GrGLCreateNullInterface.cpp

Index: src/gpu/gl/GrGLCreateNullInterface.cpp
diff --git a/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp
index ccaab598b87db5733b4117087e0bb6704d99dd88..1febfb848a7a7c8dbf9ff0f8f1cb2b141211073e 100644
--- a/src/gpu/gl/GrGLCreateNullInterface.cpp
+++ b/src/gpu/gl/GrGLCreateNullInterface.cpp
@@ -323,19 +323,19 @@ public:
     }
 
     GrGLvoid getQueryObjecti64v(GrGLuint id, GrGLenum pname, GrGLint64 *params) override {
-        queryResult(id, pname, params);
+        this->queryResult(id, pname, params);
     }
 
     GrGLvoid getQueryObjectiv(GrGLuint id, GrGLenum pname, GrGLint *params) override {
-        queryResult(id, pname, params);
+        this->queryResult(id, pname, params);
     }
 
     GrGLvoid getQueryObjectui64v(GrGLuint id, GrGLenum pname, GrGLuint64 *params) override {
-        queryResult(id, pname, params);
+        this->queryResult(id, pname, params);
     }
 
     GrGLvoid getQueryObjectuiv(GrGLuint id, GrGLenum pname, GrGLuint *params) override {
-        queryResult(id, pname, params);
+        this->queryResult(id, pname, params);
     }
 
     GrGLvoid getShaderiv(GrGLuint shader, GrGLenum pname, GrGLint* params) override {
@@ -352,13 +352,13 @@ public:
             case GR_GL_EXTENSIONS:
                 return CombinedExtensionString();
             case GR_GL_VERSION:
-                return (const GrGLubyte*)"4.0 Debug GL";
+                return (const GrGLubyte*)"4.0 Null GL";
             case GR_GL_SHADING_LANGUAGE_VERSION:
-                return (const GrGLubyte*)"4.20.8 Debug GLSL";
+                return (const GrGLubyte*)"4.20.8 Null GLSL";
             case GR_GL_VENDOR:
-                return (const GrGLubyte*)"Debug Vendor";
+                return (const GrGLubyte*)"Null Vendor";
             case GR_GL_RENDERER:
-                return (const GrGLubyte*)"The Debug (Non-)Renderer";
+                return (const GrGLubyte*)"The Null (Non-)Renderer";
             default:
                 SkFAIL("Unexpected name passed to GetString");
                 return nullptr;
@@ -382,13 +382,6 @@ public:
         }
     }
 
-    GrGLvoid getTexLevelParameteriv(GrGLenum target, GrGLint level, GrGLenum pname,
-                                    GrGLint* params) override {
-        // we used to use this to query stuff about externally created textures,
-        // now we just require clients to tell us everything about the texture.
-        SkFAIL("Should never query texture parameters.");
-    }
-
     GrGLint getUniformLocation(GrGLuint program, const char* name) override {
         return ++fCurrUniformLocation;
     }
@@ -597,6 +590,8 @@ private:
                 break;
         }
     }
+
+    typedef GrGLTestInterface INHERITED;
 };
 
 const char* NullInterface::kExtensions[] = {