Revert of Cleanup of shader building system

src/gpu/gl/builders/GrGLGeometryShaderBuilder.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLGeometryShaderBuilder_DEFINED
 #define GrGLGeometryShaderBuilder_DEFINED
 
 #include "GrGLShaderBuilder.h"
 
-class GrGLGeometryBuilder : public GrGLShaderBuilder {
+class GrGLProgramBuilder;
+
+class GrGLGeometryShaderBuilder : public GrGLFullShaderBuilder {
 public:
-    GrGLGeometryBuilder(GrGLProgramBuilder* program);
+    GrGLGeometryShaderBuilder(GrGLFullProgramBuilder* program);
+private:
     /*
      * an internal call for GrGLFullProgramBuilder to add varyings
      */
     void addVarying(GrSLType type,
                    const char* name,
                    const char** gsOutName);
 
     bool compileAndAttachShaders(GrGLuint programId, SkTDArray<GrGLuint>* shaderIds) const;
 
-    typedef GrGLShaderBuilder INHERITED;
+    friend class GrGLFullProgramBuilder;
+    typedef GrGLFullShaderBuilder INHERITED;
 };
 
 #endif