Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/mocks.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.
 
 // This file contains definitions for mock objects, used for testing.
 
 // TODO(apatrick): This file "manually" defines some mock objects. Using gMock
 // would be definitely preferable, unfortunately it doesn't work on Windows yet.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_MOCKS_H_
@@ skipping 81 matching lines @@
   MOCK_CONST_METHOD0(name_map, const NameMap&());
 };
 
 class MockProgramCache : public ProgramCache {
  public:
   MockProgramCache();
   virtual ~MockProgramCache();
 
   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());
 };
 
 class MockMemoryTracker : public MemoryTracker {
  public:
   MockMemoryTracker();
 
   MOCK_METHOD3(TrackMemoryAllocatedChange, void(
       size_t old_size, size_t new_size, Pool pool));
   MOCK_METHOD1(EnsureGPUMemoryAvailable, bool(size_t size_needed));
 
  private:
   friend class ::testing::StrictMock<MockMemoryTracker>;
   friend class base::RefCounted< ::testing::StrictMock<MockMemoryTracker> >;
   virtual ~MockMemoryTracker();
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_MOCKS_H_