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

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 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/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
@@ skipping 445 matching lines @@
   }
 
  private:
   class MockSetWorkerContextShouldAggressivelyFreeResourcesOutputSurface
       : public FakeOutputSurface {
    public:
     ~MockSetWorkerContextShouldAggressivelyFreeResourcesOutputSurface() {}
     explicit MockSetWorkerContextShouldAggressivelyFreeResourcesOutputSurface(
         bool delegated_rendering)
         : FakeOutputSurface(TestContextProvider::Create(),
-                            TestContextProvider::CreateWorker(),
+                            TestContextProvider::Create(),
                             delegated_rendering) {}
     MOCK_METHOD1(SetWorkerContextShouldAggressivelyFreeResources,
                  void(bool is_visible));
   };
 };
 
 // Test if the LTH successfully frees resources on the worker context when
 // visibility is set to false.
 class LayerTreeHostFreeWorkerContextResourcesOnInvisible
     : public LayerTreeHostFreeWorkerContextResourcesTest {
@@ skipping 5728 matching lines @@
   ScrollAndScaleSet scale_info_;
   ScrollAndScaleSet no_op_info_;
   bool requested_update_layers_;
   int commit_count_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostScrollingAndScalingUpdatesLayers);
 
 }  // namespace
 }  // namespace cc