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

cc/output/output_surface.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 "cc/output/output_surface.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 110 matching lines @@
   if (context_provider_.get()) {
     success = context_provider_->BindToCurrentThread();
     if (success) {
       context_provider_->SetLostContextCallback(base::Bind(
           &OutputSurface::DidLoseOutputSurface, base::Unretained(this)));
       context_provider_->SetMemoryPolicyChangedCallback(
           base::Bind(&OutputSurface::SetMemoryPolicy, base::Unretained(this)));
     }
   }
 
+  if (success && worker_context_provider_.get()) {
+    success = worker_context_provider_->BindToCurrentThread();
+    if (success)
+      worker_context_provider_->SetupLock();
+  }
+
   if (!success)
     client_ = NULL;
 
   return success;
 }
 
 void OutputSurface::EnsureBackbuffer() {
   if (software_device_)
     software_device_->EnsureBackbuffer();
 }
@@ skipping 71 matching lines @@
           aggressively_free_resources);
     }
   }
 }
 
 bool OutputSurface::SurfaceIsSuspendForRecycle() const {
   return false;
 }
 
 }  // namespace cc