Cleanup of shader building system

src/gpu/gl/builders/GrGLGeometryShaderBuilder.h

Index: src/gpu/gl/builders/GrGLGeometryShaderBuilder.h
diff --git a/src/gpu/gl/builders/GrGLGeometryShaderBuilder.h b/src/gpu/gl/builders/GrGLGeometryShaderBuilder.h
index 833d31774f82f7f0a69d0921a4a98b95d9181b66..aa27f23f03f6d402900cf30736a8f171dc4771fc 100644
--- a/src/gpu/gl/builders/GrGLGeometryShaderBuilder.h
+++ b/src/gpu/gl/builders/GrGLGeometryShaderBuilder.h
@@ -10,12 +10,9 @@
 
 #include "GrGLShaderBuilder.h"
 
-class GrGLProgramBuilder;
-
-class GrGLGeometryShaderBuilder : public GrGLFullShaderBuilder {
+class GrGLGeometryBuilder : public GrGLShaderBuilder {
 public:
-    GrGLGeometryShaderBuilder(GrGLFullProgramBuilder* program);
-private:
+    GrGLGeometryBuilder(GrGLProgramBuilder* program);
     /*
      * an internal call for GrGLFullProgramBuilder to add varyings
      */
@@ -25,8 +22,7 @@ private:
 
     bool compileAndAttachShaders(GrGLuint programId, SkTDArray<GrGLuint>* shaderIds) const;
 
-    friend class GrGLFullProgramBuilder;
-    typedef GrGLFullShaderBuilder INHERITED;
+    typedef GrGLShaderBuilder INHERITED;
 };
 
 #endif