Rename GrGLUniformManager to GrGLUniform and ref GrGLUniforms directly

src/gpu/gl/GrGLEffectMatrix.h

Index: src/gpu/gl/GrGLEffectMatrix.h
diff --git a/src/gpu/gl/GrGLEffectMatrix.h b/src/gpu/gl/GrGLEffectMatrix.h
index fc4b7831336d69a5fd1f65c29ee176384b58e4d6..606bc24316701fb65f8d4ab16c074df580af3ff8 100644
--- a/src/gpu/gl/GrGLEffectMatrix.h
+++ b/src/gpu/gl/GrGLEffectMatrix.h
@@ -59,7 +59,7 @@ public:
     };
 
     GrGLEffectMatrix(CoordsType coordsType)
-        : fUni(GrGLUniformManager::kInvalidUniformHandle)
+        : fUni(NULL)
         , fCoordsType(coordsType) {
         GrAssert(GrEffect::kLocal_CoordsType == coordsType ||
                  GrEffect::kPosition_CoordsType == coordsType);
@@ -107,12 +107,12 @@ public:
      * Call from a GrGLEffect's subclass to update the texture matrix. The effectMatrix and texture
      * params should match those used with GenKey.
      */
-    void setData(const GrGLUniformManager& uniformManager,
+    void setData(const GrGLContext& context,
                  const SkMatrix& effectMatrix,
                  const GrDrawEffect& drawEffect,
                  const GrTexture*);
 
-    GrGLUniformManager::UniformHandle fUni;
+    GrGLUniform*      fUni;
     GrSLType                          fUniType;
     SkMatrix                          fPrevMatrix;
     CoordsType                        fCoordsType;