Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/program_cache.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_PROGRAM_CACHE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_CACHE_H_
 
 #include <map>
 #include <string>
 
@@ skipping 36 matching lines @@
 
   LinkedProgramStatus GetLinkedProgramStatus(
       const std::string& untranslated_a,
       const std::string& untranslated_b,
       const LocationMap* bind_attrib_location_map) const;
 
   // Loads the linked program from the cache.  If the program is not found or
   // 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
   void Clear();
 
   // Only for testing
   void LinkedProgramCacheSuccess(const std::string& shader_a,
                                  const std::string& shader_b,
                                  const LocationMap* bind_attrib_location_map);
 
@@ skipping 41 matching lines @@
   CompileStatusMap shader_status_;
   LinkStatusMap link_status_;
 
   DISALLOW_COPY_AND_ASSIGN(ProgramCache);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_CACHE_H_