Update from https://crrev.com/316786

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 70 matching lines @@
 
  private:
   CommandBufferEngine *engine_;
 };
 
 namespace gles2 {
 
 class MockShaderTranslator : public ShaderTranslatorInterface {
  public:
   MockShaderTranslator();
-  virtual ~MockShaderTranslator();
 
   MOCK_METHOD5(Init, bool(
       sh::GLenum shader_type,
       ShShaderSpec shader_spec,
       const ShBuiltInResources* resources,
       GlslImplementationType glsl_implementation_type,
       ShCompileOptions driver_bug_workarounds));
   MOCK_CONST_METHOD7(Translate, bool(
       const std::string& shader_source,
       std::string* info_log,
       std::string* translated_source,
       AttributeMap* attrib_map,
       UniformMap* uniform_map,
       VaryingMap* varying_map,
       NameMap* name_map));
   MOCK_CONST_METHOD0(
       GetStringForOptionsThatWouldAffectCompilation, std::string());
+ private:
+  ~MockShaderTranslator() override;
 };
 
 class MockProgramCache : public ProgramCache {
  public:
   MockProgramCache();
   virtual ~MockProgramCache();
 
-  MOCK_METHOD7(LoadLinkedProgram, ProgramLoadResult(
+  MOCK_METHOD5(LoadLinkedProgram, ProgramLoadResult(
       GLuint program,
       Shader* shader_a,
-      const ShaderTranslatorInterface* translator_a,
       Shader* shader_b,
-      const ShaderTranslatorInterface* translator_b,
       const LocationMap* bind_attrib_location_map,
       const ShaderCacheCallback& callback));
 
-  MOCK_METHOD7(SaveLinkedProgram, void(
+  MOCK_METHOD5(SaveLinkedProgram, void(
       GLuint program,
       const Shader* shader_a,
-      const ShaderTranslatorInterface* translator_a,
       const Shader* shader_b,
-      const ShaderTranslatorInterface* translator_b,
       const LocationMap* bind_attrib_location_map,
       const ShaderCacheCallback& callback));
   MOCK_METHOD1(LoadProgram, void(const std::string&));
 
  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_