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

ui/compositor/test/in_process_context_factory.cc

 // Copyright 2014 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_factory.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/threading/thread.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 97 matching lines @@
   attribs.fail_if_major_perf_caveat = false;
   attribs.bind_generates_resource = false;
 
   scoped_refptr<InProcessContextProvider> context_provider =
       InProcessContextProvider::Create(attribs, &gpu_memory_buffer_manager_,
                                        &image_factory_,
                                        compositor->widget(), "UICompositor");
   scoped_refptr<InProcessContextProvider> worker_context_provider =
       InProcessContextProvider::CreateOffscreen(&gpu_memory_buffer_manager_,
                                                 &image_factory_);
-  if (worker_context_provider &&
-      !worker_context_provider->BindToCurrentThread())
-    worker_context_provider = nullptr;
-  if (worker_context_provider) {
-    worker_context_provider->SetupLock();
-    // Detach from thread to allow context to be destroyed on a different
-    // thread without being used.
-    worker_context_provider->DetachFromThread();
-  }
 
   scoped_ptr<cc::OutputSurface> real_output_surface;
 
   if (use_test_surface_) {
     bool flipped_output_surface = false;
     real_output_surface = make_scoped_ptr(new cc::PixelTestOutputSurface(
         context_provider, worker_context_provider, flipped_output_surface));
   } else {
     real_output_surface = make_scoped_ptr(
         new DirectOutputSurface(context_provider, worker_context_provider));
@@ skipping 84 matching lines @@
 }
 
 void InProcessContextFactory::ResizeDisplay(ui::Compositor* compositor,
                                             const gfx::Size& size) {
   if (!per_compositor_data_.count(compositor))
     return;
   per_compositor_data_[compositor]->display()->Resize(size);
 }
 
 }  // namespace ui