Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/memory_program_cache_unittest.cc

Index: gpu/command_buffer/service/memory_program_cache_unittest.cc
diff --git a/gpu/command_buffer/service/memory_program_cache_unittest.cc b/gpu/command_buffer/service/memory_program_cache_unittest.cc
index 01bae9a1d696bcafaca42f8fbd1cc174ec8e862e..ca24707ea663e68df581f7edd30406a7b62032b8 100644
--- a/gpu/command_buffer/service/memory_program_cache_unittest.cc
+++ b/gpu/command_buffer/service/memory_program_cache_unittest.cc
@@ -84,10 +84,10 @@ class MemoryProgramCacheTest : public testing::Test {
     gl_.reset(new ::testing::StrictMock<gfx::MockGLInterface>());
     ::gfx::GLInterface::SetGLInterface(gl_.get());
 
-    vertex_shader_ = shader_manager_.CreateShaderInfo(kVertexShaderClientId,
+    vertex_shader_ = shader_manager_.CreateShader(kVertexShaderClientId,
                                                       kVertexShaderServiceId,
                                                       GL_VERTEX_SHADER);
-    fragment_shader_ = shader_manager_.CreateShaderInfo(
+    fragment_shader_ = shader_manager_.CreateShader(
         kFragmentShaderClientId,
         kFragmentShaderServiceId,
         GL_FRAGMENT_SHADER);
@@ -168,8 +168,8 @@ class MemoryProgramCacheTest : public testing::Test {
   scoped_ptr< ::testing::StrictMock<gfx::MockGLInterface> > gl_;
   scoped_ptr<MemoryProgramCache> cache_;
   ShaderManager shader_manager_;
-  ShaderManager::ShaderInfo* vertex_shader_;
-  ShaderManager::ShaderInfo* fragment_shader_;
+  Shader* vertex_shader_;
+  Shader* fragment_shader_;
 };
 
 TEST_F(MemoryProgramCacheTest, CacheSave) {