Rename StageKey and related stuff.

R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6785049

git-svn-id: http://skia.googlecode.com/svn/trunk@6130 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index b95a0bf..e6b2f56 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -136,7 +136,7 @@
                 pdesc.fVertexLayout |= kTextFormat_VertexLayoutBit;
             }
 
-            stage.fCustomStageKey = 0;
+            stage.fEffectKey = 0;
 
             stage.fOptFlags |= STAGE_OPTS[random_int(&random, GR_ARRAY_COUNT(STAGE_OPTS))];
 
@@ -147,8 +147,8 @@
                                                       getContext(),
                                                       dummyTextures));
                 if (NULL != effects[s]) {
-                    stage.fCustomStageKey =
-                        effects[s]->getFactory().glStageKey(*effects[s], this->glCaps());
+                    stage.fEffectKey =
+                        effects[s]->getFactory().glEffectKey(*effects[s], this->glCaps());
                 }
             }
         }