Cleanup in GrPipelineBuilder

src/gpu/GrDrawTarget.h

Index: src/gpu/GrDrawTarget.h
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index d5063c62edf755ff9b63f88e3d3ee09b25f9cb6f..dc1be12ee62263fa4330ec25afd425d2ebe307f6 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -789,9 +789,9 @@ private:
                                            GrStencilSettings*);
     virtual GrClipMaskManager* clipMaskManager() = 0;
     virtual bool setupClip(GrPipelineBuilder*,
-                           GrPipelineBuilder::AutoRestoreEffects* are,
-                           GrPipelineBuilder::AutoRestoreStencil* ars,
-                           GrScissorState* scissorState,
+                           GrPipelineBuilder::AutoRestoreFragmentProcessors*,
+                           GrPipelineBuilder::AutoRestoreStencil*,
+                           GrScissorState*,
                            const SkRect* devBounds) = 0;
 
     enum {
@@ -848,8 +848,8 @@ private:
     GrClipMaskManager* clipMaskManager() SK_OVERRIDE { return &fClipMaskManager; }
 
     virtual bool setupClip(GrPipelineBuilder*,
-                           GrPipelineBuilder::AutoRestoreEffects* are,
-                           GrPipelineBuilder::AutoRestoreStencil* ars,
+                           GrPipelineBuilder::AutoRestoreFragmentProcessors*,
+                           GrPipelineBuilder::AutoRestoreStencil*,
                            GrScissorState* scissorState,
                            const SkRect* devBounds) SK_OVERRIDE;