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

content/browser/android/in_process/synchronous_compositor_factory_impl.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 "content/browser/android/in_process/synchronous_compositor_factory_impl.h"
 
 #include "base/command_line.h"
 #include "base/observer_list.h"
 #include "base/sys_info.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 155 matching lines @@
 
 scoped_ptr<cc::OutputSurface>
 SynchronousCompositorFactoryImpl::CreateOutputSurface(
     int routing_id,
     int surface_id,
     scoped_refptr<content::FrameSwapMessageQueue> frame_swap_message_queue) {
   scoped_refptr<cc::ContextProvider> onscreen_context =
       CreateContextProviderForCompositor(surface_id, RENDER_COMPOSITOR_CONTEXT);
   scoped_refptr<cc::ContextProvider> worker_context =
       CreateContextProviderForCompositor(0, RENDER_WORKER_CONTEXT);
-  if (!worker_context->BindToCurrentThread())
-    worker_context = nullptr;
-  if (worker_context) {
-    worker_context->SetupLock();
-    // Detach from thread to allow context to be destroyed on a
-    // different thread without being used.
-    worker_context->DetachFromThread();
-  }
 
   return make_scoped_ptr(new SynchronousCompositorOutputSurface(
       onscreen_context, worker_context, routing_id, frame_swap_message_queue));
 }
 
 InputHandlerManagerClient*
 SynchronousCompositorFactoryImpl::GetInputHandlerManagerClient() {
   return synchronous_input_event_filter();
 }
 
@@ skipping 163 matching lines @@
 void SynchronousCompositorFactoryImpl::SetRecordFullDocument(
     bool record_full_document) {
   record_full_layer_ = record_full_document;
 }
 
 void SynchronousCompositorFactoryImpl::SetUseIpcCommandBuffer() {
   use_ipc_command_buffer_ = true;
 }
 
 }  // namespace content