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

ui/compositor/test/in_process_context_provider.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 "ui/compositor/test/in_process_context_provider.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
@@ skipping 200 matching lines @@
     const LostContextCallback& lost_context_callback) {
   lost_context_callback_ = lost_context_callback;
 }
 
 void InProcessContextProvider::SetMemoryPolicyChangedCallback(
     const MemoryPolicyChangedCallback& memory_policy_changed_callback) {
   // There's no memory manager for the in-process implementation.
 }
 
 void InProcessContextProvider::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(destroyed_lock_);
     if (destroyed_)
       return;
     destroyed_ = true;
   }
   if (!lost_context_callback_.is_null())
     base::ResetAndReturn(&lost_context_callback_).Run();
   if (gr_context_)
     gr_context_->abandonContext();
 }
 
 }  // namespace ui