Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/program_cache.h

Index: gpu/command_buffer/service/program_cache.h
diff --git a/gpu/command_buffer/service/program_cache.h b/gpu/command_buffer/service/program_cache.h
index 310908b7f200db07bb97b1ef59c9ee5e141f5e40..e52a4655b9ea1f3b2910dc8f3794d9a93751696a 100644
--- a/gpu/command_buffer/service/program_cache.h
+++ b/gpu/command_buffer/service/program_cache.h
@@ -54,16 +54,16 @@ class GPU_EXPORT ProgramCache {
   // there was an error, PROGRAM_LOAD_FAILURE should be returned.
   virtual ProgramLoadResult LoadLinkedProgram(
       GLuint program,
-      ShaderManager::ShaderInfo* shader_a,
-      ShaderManager::ShaderInfo* shader_b,
+      Shader* shader_a,
+      Shader* shader_b,
       const LocationMap* bind_attrib_location_map) const = 0;
 
   // Saves the program into the cache.  If successful, the implementation should
   // call LinkedProgramCacheSuccess.
   virtual void SaveLinkedProgram(
       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) = 0;
 
   // clears the cache