Update from https://crrev.com/316786

cc/resources/tile_task_worker_pool_perftest.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/resources/tile_task_worker_pool.h"
 
 #include "base/test/test_simple_task_runner.h"
 #include "base/time/time.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/output/context_provider.h"
 #include "cc/resources/bitmap_tile_task_worker_pool.h"
+#include "cc/resources/gpu_rasterizer.h"
 #include "cc/resources/gpu_tile_task_worker_pool.h"
 #include "cc/resources/one_copy_tile_task_worker_pool.h"
 #include "cc/resources/pixel_buffer_tile_task_worker_pool.h"
 #include "cc/resources/raster_buffer.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
 #include "cc/resources/tile_task_runner.h"
 #include "cc/resources/zero_copy_tile_task_worker_pool.h"
 #include "cc/test/fake_output_surface.h"
@@ skipping 60 matching lines @@
     if (gr_context_)
       return gr_context_.get();
 
     skia::RefPtr<const GrGLInterface> null_interface =
         skia::AdoptRef(GrGLCreateNullInterface());
     gr_context_ = skia::AdoptRef(GrContext::Create(
         kOpenGL_GrBackend,
         reinterpret_cast<GrBackendContext>(null_interface.get())));
     return gr_context_.get();
   }
+  void SetupLock() override {}
+  base::Lock* GetLock() override { return &context_lock_; }
   bool IsContextLost() override { return false; }
   void VerifyContexts() override {}
   void DeleteCachedResources() override {}
   bool DestroyedOnMainThread() override { return false; }
   void SetLostContextCallback(const LostContextCallback& cb) override {}
   void SetMemoryPolicyChangedCallback(
       const MemoryPolicyChangedCallback& cb) override {}
 
  private:
   ~PerfContextProvider() override {}
 
   scoped_ptr<PerfGLES2Interface> context_gl_;
   skia::RefPtr<class GrContext> gr_context_;
   TestContextSupport support_;
+  base::Lock context_lock_;
 };
 
 enum TileTaskWorkerPoolType {
   TILE_TASK_WORKER_POOL_TYPE_PIXEL_BUFFER,
   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
 };
 
@@ skipping 105 matching lines @@
       queue->items.push_back(
           TileTaskQueue::Item(raster_tasks[i].get(), task_set_collection));
     }
   }
 
  protected:
   scoped_refptr<ContextProvider> context_provider_;
   FakeOutputSurfaceClient output_surface_client_;
   scoped_ptr<FakeOutputSurface> output_surface_;
   scoped_ptr<ResourceProvider> resource_provider_;
+  scoped_ptr<Rasterizer> rasterizer_;
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   scoped_ptr<TaskGraphRunner> task_graph_runner_;
   LapTimer timer_;
 };
 
 class TileTaskWorkerPoolPerfTest
     : public TileTaskWorkerPoolPerfTestBase,
       public testing::TestWithParam<TileTaskWorkerPoolType>,
       public TileTaskRunnerClient {
  public:
@@ skipping 19 matching lines @@
                                                       GL_TEXTURE_2D);
         tile_task_worker_pool_ = OneCopyTileTaskWorkerPool::Create(
             task_runner_.get(), task_graph_runner_.get(),
             context_provider_.get(), resource_provider_.get(),
             staging_resource_pool_.get());
         break;
       case TILE_TASK_WORKER_POOL_TYPE_GPU:
         Create3dOutputSurfaceAndResourceProvider();
         tile_task_worker_pool_ = GpuTileTaskWorkerPool::Create(
             task_runner_.get(), task_graph_runner_.get(),
-            resource_provider_.get());
+            static_cast<GpuRasterizer*>(rasterizer_.get()));
         break;
       case TILE_TASK_WORKER_POOL_TYPE_BITMAP:
         CreateSoftwareOutputSurfaceAndResourceProvider();
         tile_task_worker_pool_ = BitmapTileTaskWorkerPool::Create(
             task_runner_.get(), task_graph_runner_.get(),
             resource_provider_.get());
         break;
     }
 
     DCHECK(tile_task_worker_pool_);
@@ skipping 223 matching lines @@
   RunBuildTileTaskQueueTest("1_0", 1, 0);
   RunBuildTileTaskQueueTest("32_0", 32, 0);
   RunBuildTileTaskQueueTest("1_1", 1, 1);
   RunBuildTileTaskQueueTest("32_1", 32, 1);
   RunBuildTileTaskQueueTest("1_4", 1, 4);
   RunBuildTileTaskQueueTest("32_4", 32, 4);
 }
 
 }  // namespace
 }  // namespace cc