Rename GrGLUniformManager to GrGLUniform and ref GrGLUniforms directly

src/gpu/gl/GrGLEffectMatrix.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLEffectMatrix_DEFINED
 #define GrGLEffectMatrix_DEFINED
 
@@ skipping 41 matching lines @@
      * The matrix uses kKeyBits of the effect's EffectKey. A GrGLEffect may place these bits at an
      * arbitrary shift in its final key. However, when GrGLEffectMatrix::emitCode*() code is called
      * the relevant bits must be in the lower kKeyBits of the key parameter.
      */
     enum {
         kKeyBits = kKeyBitsPrivate,
         kKeyMask = (1 << kKeyBits) - 1,
     };
 
     GrGLEffectMatrix(CoordsType coordsType)
-        : fUni(GrGLUniformManager::kInvalidUniformHandle)
+        : fUni(NULL)
         , fCoordsType(coordsType) {
         GrAssert(GrEffect::kLocal_CoordsType == coordsType ||
                  GrEffect::kPosition_CoordsType == coordsType);
         fPrevMatrix = SkMatrix::InvalidMatrix();
     }
 
     /**
      * Generates the key for the portion of the code emitted by this class's emitCode() function.
      * Pass a texture to make GrGLEffectMatrix automatically adjust for the texture's origin. Pass
      * NULL when not using the EffectMatrix for a texture lookup, or if the GrGLEffect subclass
@@ skipping 27 matching lines @@
     void emitCodeMakeFSCoords2D(GrGLShaderBuilder*,
                                 EffectKey,
                                 const char** fsCoordName, /* optional */
                                 const char** vsVaryingName = NULL,
                                 GrSLType* vsVaryingType = NULL,
                                 const char* suffix = NULL);
     /**
      * 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;
 };
 
 #endif