Cleanup of shader building system

tests/GLProgramsTest.cpp

Index: tests/GLProgramsTest.cpp
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index a16173b9652f772de9ee8eeefe9a3a0117173d54..6712d5bad6ed47348bba7c7b38fbb3a3d4e2d033 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -16,6 +16,7 @@
 #include "GrContextFactory.h"
 #include "GrOptDrawState.h"
 #include "effects/GrConfigConversionEffect.h"
+#include "gl/builders/GrGLProgramBuilder.h"
 #include "gl/GrGLPathRendering.h"
 #include "gl/GrGpuGL.h"
 #include "SkChecksum.h"
@@ -24,7 +25,7 @@
 
 static void get_stage_stats(const GrFragmentStage stage, bool* readsDst,
                             bool* readsFragPosition, bool* requiresVertexShader) {
-    if (stage.getFragmentProcessor()->willReadDstColor()) {
+    if (stage.getProcessor()->willReadDstColor()) {
         *readsDst = true;
     }
     if (stage.getProcessor()->willReadFragmentPosition()) {
@@ -143,13 +144,14 @@ bool GrGLProgramDesc::setRandom(SkRandom* random,
 
     if (dstRead) {
         header->fDstReadKey = SkToU8(GrGLFragmentShaderBuilder::KeyForDstRead(dstCopyTexture,
-                                                                      gpu->glCaps()));
+                                                                              gpu->glCaps()));
     } else {
         header->fDstReadKey = 0;
     }
     if (fragPos) {
-        header->fFragPosKey = SkToU8(GrGLFragmentShaderBuilder::KeyForFragmentPosition(dstRenderTarget,
-                                                                               gpu->glCaps()));
+        header->fFragPosKey =
+                SkToU8(GrGLFragmentShaderBuilder::KeyForFragmentPosition(dstRenderTarget,
+                                                                         gpu->glCaps()));
     } else {
         header->fFragPosKey = 0;
     }
@@ -332,11 +334,13 @@ bool GrGpuGL::programUnitTest(int maxStages) {
             return false;
         }
 
-        SkAutoTUnref<GrGLProgram> program(GrGLProgram::Create(this,
-                                                              pdesc,
-                                                              geometryProcessor.get(),
-                                                              stages,
-                                                              stages + numColorStages));
+        SkAutoTUnref<GrGLProgram> program(
+                GrGLProgramBuilder::CreateProgram(pdesc,
+                                                  drawType,
+                                                  geometryProcessor.get(),
+                                                  stages.get(),
+                                                  stages.get() + numColorStages,
+                                                  this));
         for (int s = 0; s < numStages; ++s) {
             SkDELETE(stages[s]);
         }