Rename GrOptDrawState to GrPipeline and GrDrawState to GrPipelineBuilder

src/gpu/gl/builders/GrGLProgramBuilder.h

Index: src/gpu/gl/builders/GrGLProgramBuilder.h
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h
index 612791e07807e5dbbabb5b3740e2f7563f98322e..4b40cefad0d681b326a132cf4a2b53e3d45b77b0 100644
--- a/src/gpu/gl/builders/GrGLProgramBuilder.h
+++ b/src/gpu/gl/builders/GrGLProgramBuilder.h
@@ -15,8 +15,8 @@
 #include "../GrGLUniformHandle.h"
 #include "../GrGLGeometryProcessor.h"
 #include "../GrGLXferProcessor.h"
-#include "../../GrOptDrawState.h"
 #include "../../GrPendingFragmentStage.h"
+#include "../../GrPipeline.h"
 
 /*
  * This is the base class for a series of interfaces.  This base class *MUST* remain abstract with
@@ -283,7 +283,7 @@ protected:
     GrGLProgramBuilder(GrGLGpu*, const DrawArgs&);
 
     const GrPrimitiveProcessor& primitiveProcessor() const { return *fArgs.fPrimitiveProcessor; }
-    const GrOptDrawState& optState() const { return *fArgs.fOptState; }
+    const GrPipeline& pipeline() const { return *fArgs.fPipeline; }
     const GrProgramDesc& desc() const { return *fArgs.fDesc; }
     const GrBatchTracker& batchTracker() const { return *fArgs.fBatchTracker; }
     const GrProgramDesc::KeyHeader& header() const { return fArgs.fDesc->header(); }