Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*.

include/gpu/GrEffectUnitTest.h

Index: include/gpu/GrEffectUnitTest.h
diff --git a/include/gpu/GrEffectUnitTest.h b/include/gpu/GrEffectUnitTest.h
index f71ab54e7e3f1290798f529b7a9441d9444adb2d..ffc64f2b8268b5c646a9d92529d94346e294c69a 100644
--- a/include/gpu/GrEffectUnitTest.h
+++ b/include/gpu/GrEffectUnitTest.h
@@ -32,26 +32,26 @@ const SkMatrix& TestMatrix(SkRandom*);
 #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
 
 class GrContext;
-class GrEffectRef;
+class GrEffect;
 class GrTexture;
 
 class GrEffectTestFactory : SkNoncopyable {
 public:
 
-    typedef GrEffectRef* (*CreateProc)(SkRandom*,
-                                       GrContext*,
-                                       const GrDrawTargetCaps& caps,
-                                       GrTexture* dummyTextures[]);
+    typedef GrEffect* (*CreateProc)(SkRandom*,
+                                    GrContext*,
+                                    const GrDrawTargetCaps& caps,
+                                    GrTexture* dummyTextures[]);
 
     GrEffectTestFactory(CreateProc createProc) {
         fCreateProc = createProc;
         GetFactories()->push_back(this);
     }
 
-    static GrEffectRef* CreateStage(SkRandom* random,
-                                    GrContext* context,
-                                    const GrDrawTargetCaps& caps,
-                                    GrTexture* dummyTextures[]) {
+    static GrEffect* CreateStage(SkRandom* random,
+                                 GrContext* context,
+                                 const GrDrawTargetCaps& caps,
+                                 GrTexture* dummyTextures[]) {
         uint32_t idx = random->nextRangeU(0, GetFactories()->count() - 1);
         GrEffectTestFactory* factory = (*GetFactories())[idx];
         return factory->fCreateProc(random, context, caps, dummyTextures);
@@ -67,10 +67,10 @@ private:
  */
 #define GR_DECLARE_EFFECT_TEST                                                      \
     static GrEffectTestFactory gTestFactory;                                        \
-    static GrEffectRef* TestCreate(SkRandom*,                                       \
-                                   GrContext*,                                      \
-                                   const GrDrawTargetCaps&,                         \
-                                   GrTexture* dummyTextures[2])
+    static GrEffect* TestCreate(SkRandom*,                                          \
+                                GrContext*,                                         \
+                                const GrDrawTargetCaps&,                            \
+                                GrTexture* dummyTextures[2])
 
 /** GrEffect subclasses should insert this macro in their implementation file. They must then
  *  also implement this static function:
@@ -91,10 +91,10 @@ private:
 // The unit test relies on static initializers. Just declare the TestCreate function so that
 // its definitions will compile.
 #define GR_DECLARE_EFFECT_TEST                                                      \
-    static GrEffectRef* TestCreate(SkRandom*,                                       \
-                                   GrContext*,                                      \
-                                   const GrDrawTargetCaps&,                         \
-                                   GrTexture* dummyTextures[2])
+    static GrEffect* TestCreate(SkRandom*,                                          \
+                                GrContext*,                                         \
+                                const GrDrawTargetCaps&,                            \
+                                GrTexture* dummyTextures[2])
 #define GR_DEFINE_EFFECT_TEST(X)
 
 #endif // !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS