Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/mocks.h

Index: gpu/command_buffer/service/mocks.h
diff --git a/gpu/command_buffer/service/mocks.h b/gpu/command_buffer/service/mocks.h
index 0ab688c9a2a9c461c623717d875f68a797d315e3..35fc9c17fe3b55b605080f98a9b9e2418534e4fb 100644
--- a/gpu/command_buffer/service/mocks.h
+++ b/gpu/command_buffer/service/mocks.h
@@ -99,14 +99,14 @@ class MockProgramCache : public ProgramCache {
 
   MOCK_CONST_METHOD4(LoadLinkedProgram, ProgramLoadResult(
       GLuint program,
-      ShaderManager::ShaderInfo* shader_a,
-      ShaderManager::ShaderInfo* shader_b,
+      Shader* shader_a,
+      Shader* shader_b,
       const LocationMap* bind_attrib_location_map));
 
   MOCK_METHOD4(SaveLinkedProgram, void(
       GLuint program,
-      const ShaderManager::ShaderInfo* shader_a,
-      const ShaderManager::ShaderInfo* shader_b,
+      const Shader* shader_a,
+      const Shader* shader_b,
       const LocationMap* bind_attrib_location_map));
  private:
   MOCK_METHOD0(ClearBackend, void());