Revert "Reverting as this is suspected of causing check_deps failure on Linux bot"

gpu/command_buffer/client/gles2_implementation.h

 // Copyright (c) 2011 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_CLIENT_GLES2_IMPLEMENTATION_H_
 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 
 #include <GLES2/gl2.h>
 
 #include <map>
 #include <queue>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "../common/gles2_cmd_utils.h"
 #include "../common/scoped_ptr.h"
 #include "../client/gles2_cmd_helper.h"
 #include "../client/ring_buffer.h"
 
 #if !defined(NDEBUG) && !defined(__native_client__) && !defined(GLES2_CONFORMANCE_TESTS)  // NOLINT
   #if defined(GLES2_INLINE_OPTIMIZATION)
     // TODO(gman): Replace with macros that work with inline optmization.
+    #define GPU_CLIENT_SINGLE_THREAD_CHECK()
     #define GPU_CLIENT_LOG(args)
     #define GPU_CLIENT_LOG_CODE_BLOCK(code)
     #define GPU_CLIENT_DCHECK_CODE_BLOCK(code)
   #else
     #include "base/logging.h"
+    #define GPU_CLIENT_SINGLE_THREAD_CHECK() SingleThreadChecker checker(this);
     #define GPU_CLIENT_LOG(args)  DLOG_IF(INFO, debug_) << args;
     #define GPU_CLIENT_LOG_CODE_BLOCK(code) code
     #define GPU_CLIENT_DCHECK_CODE_BLOCK(code) code
     #define GPU_CLIENT_DEBUG
   #endif
 #else
+  #define GPU_CLIENT_SINGLE_THREAD_CHECK()
   #define GPU_CLIENT_LOG(args)
   #define GPU_CLIENT_LOG_CODE_BLOCK(code)
   #define GPU_CLIENT_DCHECK_CODE_BLOCK(code)
 #endif
 
 // Check that destination pointers point to initialized memory.
 // When the context is lost, calling GL function has no effect so if destination
 // pointers point to initialized memory it can often lead to crash bugs. eg.
 //
 // GLsizei len;
@@ skipping 331 matching lines @@
     }
 
     // texture currently bound to this unit's GL_TEXTURE_2D with glBindTexture
     GLuint bound_texture_2d;
 
     // texture currently bound to this unit's GL_TEXTURE_CUBE_MAP with
     // glBindTexture
     GLuint bound_texture_cube_map;
   };
 
+  // Checks for single threaded access.
+  class SingleThreadChecker {
+   public:
+    SingleThreadChecker(GLES2Implementation* gles2_implementation);
+    ~SingleThreadChecker();
+
+   private:
+    GLES2Implementation* gles2_implementation_;
+  };
+
   // Gets the value of the result.
   template <typename T>
   T GetResultAs() {
     return static_cast<T>(transfer_buffer_.GetResultBuffer());
   }
 
   int32 GetResultShmId() {
     return transfer_buffer_.GetShmId();
   }
 
@@ skipping 139 matching lines @@
   uint32 error_bits_;
 
   // Whether or not to print debugging info.
   bool debug_;
 
   // Whether or not this context is sharing resources.
   bool sharing_resources_;
 
   bool bind_generates_resource_;
 
+  // Used to check for single threaded access.
+  int use_count_;
+
   // Map of GLenum to Strings for glGetString.  We need to cache these because
   // the pointer passed back to the client has to remain valid for eternity.
   typedef std::map<uint32, std::set<std::string> > GLStringMap;
   GLStringMap gl_strings_;
 
   // Similar cache for glGetRequestableExtensionsCHROMIUM. We don't
   // have an enum for this so handle it separately.
   std::set<std::string> requestable_extensions_set_;
 
   typedef std::map<const void*, MappedBuffer> MappedBufferMap;
@@ skipping 39 matching lines @@
 
 inline bool GLES2Implementation::GetTexParameterivHelper(
     GLenum /* target */, GLenum /* pname */, GLint* /* params */) {
   return false;
 }
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_