Revert of Another trivial cleanup

src/gpu/GrPipeline.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrPipeline_DEFINED
 #define GrPipeline_DEFINED
 
 #include "GrColor.h"
 #include "GrGpu.h"
-#include "GrStagedProcessor.h"
-#include "GrPendingProgramElement.h"
+#include "GrPendingFragmentStage.h"
 #include "GrPrimitiveProcessor.h"
 #include "GrProgramDesc.h"
 #include "GrStencil.h"
 #include "GrTypesPriv.h"
 #include "SkMatrix.h"
 #include "SkRefCnt.h"
 
 class GrBatch;
 class GrDeviceCoordTexture;
 class GrPipelineBuilder;
 
-typedef GrStagedProcessor<GrPendingProgramElement> GrPendingFragmentStage;
-
 /**
  * Class that holds an optimized version of a GrPipelineBuilder. It is meant to be an immutable
  * class, and contains all data needed to set the state for a gpu draw.
  */
 class GrPipeline {
 public:
     
 
     GrPipeline(const GrPipelineBuilder&,
                const GrProcOptInfo& colorPOI,
@@ skipping 106 matching lines @@
 
     // This function is equivalent to the offset into fFragmentStages where coverage stages begin.
     int                                 fNumColorStages;
 
     GrProgramDesc fDesc;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif