More changes to bring together path / geo procs

BUG=skia:

Review URL: https://codereview.chromium.org/820783005
diff --git a/src/gpu/GrGeometryProcessor.cpp b/src/gpu/GrGeometryProcessor.cpp
index b4a9cbe..2d3f5f4 100644
--- a/src/gpu/GrGeometryProcessor.cpp
+++ b/src/gpu/GrGeometryProcessor.cpp
@@ -119,7 +119,7 @@
 GrGLPrimitiveProcessor::setupColorPassThrough(GrGLGPBuilder* pb,
                                               GrGPInput inputType,
                                               const char* outputName,
-                                              const GrGeometryProcessor::GrAttribute* colorAttr,
+                                              const GrGeometryProcessor::Attribute* colorAttr,
                                               UniformHandle* colorUniform) {
     GrGLGPFragmentBuilder* fs = pb->getFragmentShaderBuilder();
     if (kUniform_GrGPInput == inputType) {