Revert of cc: Move worker context BindToCurrentThread/SetupLock calls out of cc::OutputSurface.

content/common/gpu/client/context_provider_command_buffer.cc

 // Copyright (c) 2013 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.
 
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 
 #include <set>
 #include <vector>
 
 #include "base/callback_helpers.h"
@@ skipping 164 matching lines @@
 }
 
 void ContextProviderCommandBuffer::DeleteCachedResources() {
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (gr_context_)
     gr_context_->FreeGpuResources();
 }
 
 void ContextProviderCommandBuffer::OnLostContext() {
-  // Note: no thread check here as this should not change the thread for which
-  // this context is currently bound. e.g. a worker context might be unbound
-  // and this should not result in it being bound to the current thread.
+  DCHECK(context_thread_checker_.CalledOnValidThread());
   {
     base::AutoLock lock(main_thread_lock_);
     if (destroyed_)
       return;
     destroyed_ = true;
   }
   if (!lost_context_callback_.is_null())
     base::ResetAndReturn(&lost_context_callback_).Run();
   if (gr_context_)
     gr_context_->OnLostContext();
 }
 
 void ContextProviderCommandBuffer::OnMemoryAllocationChanged(
     const gpu::MemoryAllocation& allocation) {
-  // Note: no thread check here as this should not change the thread for which
-  // this context is currently bound. e.g. a worker context might be unbound
-  // and this should not result in it being bound to the current thread.
+  DCHECK(context_thread_checker_.CalledOnValidThread());
+
   if (memory_policy_changed_callback_.is_null())
     return;
 
   memory_policy_changed_callback_.Run(cc::ManagedMemoryPolicy(allocation));
 }
 
 void ContextProviderCommandBuffer::InitializeCapabilities() {
   Capabilities caps;
   caps.gpu = context3d_->GetImplementation()->capabilities();
 
@@ skipping 29 matching lines @@
 
   if (!memory_policy_changed_callback_.is_null()) {
     DCHECK(context3d_->GetCommandBufferProxy());
     context3d_->GetCommandBufferProxy()->SetMemoryAllocationChangedCallback(
         base::Bind(&ContextProviderCommandBuffer::OnMemoryAllocationChanged,
                    base::Unretained(this)));
   }
 }
 
 }  // namespace content