cc: Split Proxy and TaskRunnerProvider for the LayerTreeHost

cc/trees/occlusion_tracker_perftest.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 "cc/trees/occlusion_tracker.h"
 
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/layers/layer_iterator.h"
 #include "cc/layers/solid_color_layer_impl.h"
+#include "cc/test/fake_impl_task_runner_provider.h"
 #include "cc/test/fake_layer_tree_host_impl_client.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_proxy.h"
 #include "cc/test/fake_rendering_stats_instrumentation.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_test.h"
 
 namespace cc {
 namespace {
 
 static const int kTimeLimitMillis = 2000;
 static const int kWarmupRuns = 5;
 static const int kTimeCheckInterval = 10;
 
 class OcclusionTrackerPerfTest : public testing::Test {
  public:
   OcclusionTrackerPerfTest()
       : timer_(kWarmupRuns,
                base::TimeDelta::FromMilliseconds(kTimeLimitMillis),
                kTimeCheckInterval),
-        proxy_(base::ThreadTaskRunnerHandle::Get(), nullptr),
-        impl_(&proxy_),
         output_surface_(FakeOutputSurface::Create3d()) {}
   void CreateHost() {
     LayerTreeSettings settings;
-    host_impl_ = LayerTreeHostImpl::Create(settings, &client_, &proxy_, &stats_,
-                                           &shared_bitmap_manager_, nullptr,
-                                           &task_graph_runner_, 1);
+    host_impl_ = LayerTreeHostImpl::Create(
+        settings, &client_, &impl_task_runner_provider_, &stats_,
+        &shared_bitmap_manager_, nullptr, &task_graph_runner_, 1);
     host_impl_->SetVisible(true);
     host_impl_->InitializeRenderer(output_surface_.get());
 
     scoped_ptr<LayerImpl> root_layer = LayerImpl::Create(active_tree(), 1);
     root_layer->SetHasRenderSurface(true);
     active_tree()->SetRootLayer(root_layer.Pass());
   }
 
   LayerTreeImpl* active_tree() { return host_impl_->active_tree(); }
 
   void SetTestName(const std::string& name) { test_name_ = name; }
 
   void PrintResults() {
     CHECK(!test_name_.empty()) << "Must SetTestName() before AfterTest().";
     perf_test::PrintResult("occlusion_tracker_time",
                            "",
                            test_name_,
                            1000 * timer_.MsPerLap(),
                            "us",
                            true);
   }
 
  protected:
   LapTimer timer_;
   std::string test_name_;
   FakeLayerTreeHostImplClient client_;
-  FakeProxy proxy_;
-  DebugScopedSetImplThread impl_;
+  FakeImplTaskRunnerProvider impl_task_runner_provider_;
   FakeRenderingStatsInstrumentation stats_;
   TestSharedBitmapManager shared_bitmap_manager_;
   TestTaskGraphRunner task_graph_runner_;
   scoped_ptr<OutputSurface> output_surface_;
   scoped_ptr<LayerTreeHostImpl> host_impl_;
 };
 
 TEST_F(OcclusionTrackerPerfTest, UnoccludedContentRect_FullyOccluded) {
   SetTestName("unoccluded_content_rect_fully_occluded");
 
@@ skipping 124 matching lines @@
   EXPECT_EQ(active_tree()->root_layer(), next.current_layer);
 
   ++begin;
   EXPECT_EQ(end, begin);
 
   PrintResults();
 }
 
 }  // namespace
 }  // namespace cc