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

cc/raster/tile_task_worker_pool_unittest.cc

 // Copyright 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/raster/tile_task_worker_pool.h"
 
 #include <limits>
 #include <vector>
 
 #include "base/cancelable_callback.h"
@@ skipping 115 matching lines @@
     unsigned id;
     bool canceled;
   };
 
   typedef std::vector<scoped_refptr<RasterTask>> RasterTaskVector;
 
   enum NamedTaskSet { REQUIRED_FOR_ACTIVATION, REQUIRED_FOR_DRAW, ALL };
 
   TileTaskWorkerPoolTest()
       : context_provider_(TestContextProvider::Create()),
-        worker_context_provider_(TestContextProvider::CreateWorker()),
+        worker_context_provider_(TestContextProvider::Create()),
         all_tile_tasks_finished_(
-            base::ThreadTaskRunnerHandle::Get()
-                .get(),
+            base::ThreadTaskRunnerHandle::Get().get(),
             base::Bind(&TileTaskWorkerPoolTest::AllTileTasksFinished,
                        base::Unretained(this))),
         timeout_seconds_(5),
         timed_out_(false) {}
 
   // Overridden from testing::Test:
   void SetUp() override {
     switch (GetParam()) {
       case TILE_TASK_WORKER_POOL_TYPE_ZERO_COPY:
         Create3dOutputSurfaceAndResourceProvider();
@@ skipping 260 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(TileTaskWorkerPoolTests,
                         TileTaskWorkerPoolTest,
                         ::testing::Values(TILE_TASK_WORKER_POOL_TYPE_ZERO_COPY,
                                           TILE_TASK_WORKER_POOL_TYPE_ONE_COPY,
                                           TILE_TASK_WORKER_POOL_TYPE_GPU,
                                           TILE_TASK_WORKER_POOL_TYPE_BITMAP));
 
 }  // namespace
 }  // namespace cc