Update from https://crrev.com/318214

gpu/command_buffer/service/shader_manager.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_SHADER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_
 
 #include <string>
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
@@ skipping 129 matching lines @@
 
  private:
   friend class base::RefCounted<Shader>;
   friend class ShaderManager;
 
   Shader(GLuint service_id, GLenum shader_type);
   ~Shader();
 
   void IncUseCount();
   void DecUseCount();
-  void MarkAsDeleted();
+  void Delete();
 
   int use_count_;
 
   // The current state of the shader.
   ShaderState shader_state_;
 
   // The shader this Shader is tracking.
   GLuint service_id_;
 
   // Type of shader - GL_VERTEX_SHADER or GL_FRAGMENT_SHADER.
@@ skipping 47 matching lines @@
       GLuint service_id,
       GLenum shader_type);
 
   // Gets an existing shader info for the given shader ID. Returns NULL if none
   // exists.
   Shader* GetShader(GLuint client_id);
 
   // Gets a client id for a given service id.
   bool GetClientId(GLuint service_id, GLuint* client_id) const;
 
-  void MarkAsDeleted(Shader* shader);
+  void Delete(Shader* shader);
 
   // Mark a shader as used
   void UseShader(Shader* shader);
 
   // Unmark a shader as used. If it has been deleted and is not used
   // then we free the shader.
   void UnuseShader(Shader* shader);
 
   // Check if a Shader is owned by this ShaderManager.
   bool IsOwned(Shader* shader);
 
  private:
   friend class Shader;
 
   // Info for each shader by service side shader Id.
   typedef base::hash_map<GLuint, scoped_refptr<Shader> > ShaderMap;
   ShaderMap shaders_;
 
   void RemoveShader(Shader* shader);
 
   DISALLOW_COPY_AND_ASSIGN(ShaderManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_