Update from https://crrev.com/320343

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 27 matching lines @@
   void RequestCompile(scoped_refptr<ShaderTranslatorInterface> translator,
                       TranslatedShaderSourceType type);
 
   void DoCompile();
 
   ShaderState shader_state() const {
     return shader_state_;
   }
 
   GLuint service_id() const {
-    return service_id_;
+    return marked_for_deletion_ ? 0 : service_id_;
   }
 
   GLenum shader_type() const {
     return shader_type_;
   }
 
   const std::string& source() const {
     return source_;
   }
 
@@ skipping 31 matching lines @@
 
   const std::string& log_info() const {
     return log_info_;
   }
 
   bool valid() const {
     return shader_state_ == kShaderStateCompiled && valid_;
   }
 
   bool IsDeleted() const {
-    return service_id_ == 0;
+    return marked_for_deletion_;
   }
 
   bool InUse() const {
     DCHECK_GE(use_count_, 0);
     return use_count_ != 0;
   }
 
   // Used by program cache.
   const AttributeMap& attrib_map() const {
     return attrib_map_;
@@ skipping 27 matching lines @@
     varying_map_ = VaryingMap(varying_map);
   }
 
  private:
   friend class base::RefCounted<Shader>;
   friend class ShaderManager;
 
   Shader(GLuint service_id, GLenum shader_type);
   ~Shader();
 
+  // Must be called only if we currently own the context. Forces the deletion
+  // of the underlying shader service id.
+  void Destroy();
+
   void IncUseCount();
   void DecUseCount();
-  void Delete();
+  void MarkForDeletion();
+  void DeleteServiceID();
 
   int use_count_;
 
   // The current state of the shader.
   ShaderState shader_state_;
 
+  // The shader has been marked for deletion.
+  bool marked_for_deletion_;
+
   // The shader this Shader is tracking.
   GLuint service_id_;
 
   // Type of shader - GL_VERTEX_SHADER or GL_FRAGMENT_SHADER.
   GLenum shader_type_;
 
   // Translated source type when shader was last requested to be compiled.
   TranslatedShaderSourceType source_type_;
 
   // Translator to use, set when shader was last requested to be compiled.
@@ skipping 70 matching lines @@
   void RemoveShader(Shader* shader);
 
   DISALLOW_COPY_AND_ASSIGN(ShaderManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_