Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/memory_program_cache.cc

 // 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.
 
 #include "gpu/command_buffer/service/memory_program_cache.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/sha1.h"
 #include "base/string_number_conversions.h"
@@ skipping 29 matching lines @@
 MemoryProgramCache::~MemoryProgramCache() {}
 
 void MemoryProgramCache::ClearBackend() {
   curr_size_bytes_ = 0;
   store_.clear();
   eviction_helper_.Clear();
 }
 
 ProgramCache::ProgramLoadResult MemoryProgramCache::LoadLinkedProgram(
     GLuint program,
-    ShaderManager::ShaderInfo* shader_a,
-    ShaderManager::ShaderInfo* shader_b,
+    Shader* shader_a,
+    Shader* shader_b,
     const LocationMap* bind_attrib_location_map) const {
   char a_sha[kHashLength];
   char b_sha[kHashLength];
   ComputeShaderHash(*shader_a->deferred_compilation_source(), a_sha);
   ComputeShaderHash(*shader_b->deferred_compilation_source(), b_sha);
 
   char sha[kHashLength];
   ComputeProgramHash(a_sha,
                      b_sha,
                      bind_attrib_location_map,
@@ skipping 16 matching lines @@
   }
   shader_a->set_attrib_map(value->attrib_map_0);
   shader_a->set_uniform_map(value->uniform_map_0);
   shader_b->set_attrib_map(value->attrib_map_1);
   shader_b->set_uniform_map(value->uniform_map_1);
   return PROGRAM_LOAD_SUCCESS;
 }
 
 void MemoryProgramCache::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) {
   GLenum format;
   GLsizei length = 0;
   glGetProgramiv(program, GL_PROGRAM_BINARY_LENGTH_OES, &length);
   if (length == 0 || static_cast<unsigned int>(length) > max_size_bytes_) {
     return;
   }
   scoped_array<char> binary(new char[length]);
   glGetProgramBinary(program,
                      length,
@@ skipping 72 matching lines @@
       attrib_map_0(_attrib_map_0),
       uniform_map_0(_uniform_map_0),
       shader_1_hash(_shader_1_hash, kHashLength),
       attrib_map_1(_attrib_map_1),
       uniform_map_1(_uniform_map_1) {}
 
 MemoryProgramCache::ProgramCacheValue::~ProgramCacheValue() {}
 
 }  // namespace gles2
 }  // namespace gpu