Rename GrGLUniformManager to GrGLProgramResourceManager

src/gpu/gl/GrGLProgram.h

Index: src/gpu/gl/GrGLProgram.h
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
index 37cbce8e0034edd89a30dd036d7a11d66380280b..edb24a758289bb2e1aa61531d6f221194377a120 100644
--- a/src/gpu/gl/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -15,7 +15,7 @@
 #include "GrGLShaderBuilder.h"
 #include "GrGLSL.h"
 #include "GrGLTexture.h"
-#include "GrGLUniformManager.h"
+#include "GrGLProgramDataManager.h"
 
 #include "SkString.h"
 #include "SkXfermode.h"
@@ -161,11 +161,11 @@ public:
                  SharedGLState*);
 
 private:
-    typedef GrGLUniformManager::UniformHandle UniformHandle;
+    typedef GrGLProgramDataManager::UniformHandle UniformHandle;
 
     GrGLProgram(GrGpuGL*,
                 const GrGLProgramDesc&,
-                GrGLUniformManager*,
+                GrGLProgramDataManager*,
                 const GrGLShaderBuilder::GenProgramOutput&);
 
     // Sets the texture units for samplers.
@@ -193,7 +193,7 @@ private:
     GrGLProgramDesc                     fDesc;
     GrGpuGL*                            fGpu;
 
-    SkAutoTUnref<GrGLUniformManager>    fUniformManager;
+    SkAutoTUnref<GrGLProgramDataManager> fProgramDataManager;
 
     typedef SkRefCnt INHERITED;
 };