Initial refactor of shaderbuilder

src/gpu/gl/GrGLProgramDataManager.h

Index: src/gpu/gl/GrGLProgramDataManager.h
diff --git a/src/gpu/gl/GrGLProgramDataManager.h b/src/gpu/gl/GrGLProgramDataManager.h
index 8ef4a41fbc0158fb2e8bce6ca4aa8ec30233c77f..3082f6f02b66abcea9cfa534f88e1816e224a9af 100644
--- a/src/gpu/gl/GrGLProgramDataManager.h
+++ b/src/gpu/gl/GrGLProgramDataManager.h
@@ -17,7 +17,7 @@
 class GrGpuGL;
 class SkMatrix;
 class GrGLProgram;
-class GrGLShaderBuilder;
+class GrGLProgramBuilder;
 
 /** Manages the resources used by a shader program.
  * The resources are objects the program uses to communicate with the
@@ -51,10 +51,10 @@ public:
 
         int fValue;
         friend class GrGLProgramDataManager; // For accessing toProgramDataIndex().
-        friend class GrGLShaderBuilder; // For accessing toShaderBuilderIndex().
+        friend class GrGLProgramBuilder; // For accessing toShaderBuilderIndex().
     };
 
-    GrGLProgramDataManager(GrGpuGL*, GrGLProgram*, const GrGLShaderBuilder&);
+    GrGLProgramDataManager(GrGpuGL*, GrGLProgram*, const GrGLProgramBuilder&);
 
     /** Functions for uploading uniform values. The varities ending in v can be used to upload to an
      *  array of uniforms. arrayCount must be <= the array count of the uniform.