cc: Split Proxy to eliminate unnecessary dependencies on the impl side

cc/trees/tree_synchronizer_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/tree_synchronizer.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/test/animation_test_common.h"
-#include "cc/test/fake_impl_proxy.h"
+#include "cc/test/fake_impl_task_runner_provider.h"
 #include "cc/test/fake_layer_tree_host.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/proxy.h"
 #include "cc/trees/single_thread_proxy.h"
+#include "cc/trees/task_runner_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 class MockLayerImpl : public LayerImpl {
  public:
   static scoped_ptr<MockLayerImpl> Create(LayerTreeImpl* tree_impl,
                                           int layer_id) {
     return make_scoped_ptr(new MockLayerImpl(tree_impl, layer_id));
@@ skipping 524 matching lines @@
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
                                          host_->active_tree());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
 }
 
 TEST_F(TreeSynchronizerTest, SynchronizeAnimations) {
   LayerTreeSettings settings;
-  FakeProxy proxy;
-  DebugScopedSetImplThread impl(&proxy);
+  FakeImplTaskRunnerProvider task_runner_provider;
   FakeRenderingStatsInstrumentation stats_instrumentation;
   TestSharedBitmapManager shared_bitmap_manager;
   TestTaskGraphRunner task_graph_runner;
   scoped_ptr<LayerTreeHostImpl> host_impl = LayerTreeHostImpl::Create(
-      settings, nullptr, &proxy, &stats_instrumentation, &shared_bitmap_manager,
-      nullptr, &task_graph_runner, 0);
+      settings, nullptr, &task_runner_provider, &stats_instrumentation,
+      &shared_bitmap_manager, nullptr, &task_graph_runner, 0);
 
   scoped_refptr<Layer> layer_tree_root = Layer::Create(layer_settings_);
   host_->SetRootLayer(layer_tree_root);
 
   layer_tree_root->SetLayerAnimationControllerForTest(
       FakeLayerAnimationController::Create());
 
   EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(
       layer_tree_root->layer_animation_controller())->SynchronizedAnimations());
 
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(
           layer_tree_root.get(), nullptr, host_->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
                                          host_->active_tree());
 
   EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(
       layer_tree_root->layer_animation_controller())->SynchronizedAnimations());
 }
 
 TEST_F(TreeSynchronizerTest, SynchronizeScrollParent) {
   LayerTreeSettings settings;
-  FakeProxy proxy;
-  DebugScopedSetImplThread impl(&proxy);
+  FakeImplTaskRunnerProvider task_runner_provider;
   FakeRenderingStatsInstrumentation stats_instrumentation;
   TestSharedBitmapManager shared_bitmap_manager;
   TestTaskGraphRunner task_graph_runner;
   scoped_ptr<LayerTreeHostImpl> host_impl = LayerTreeHostImpl::Create(
-      settings, nullptr, &proxy, &stats_instrumentation, &shared_bitmap_manager,
-      nullptr, &task_graph_runner, 0);
+      settings, nullptr, &task_runner_provider, &stats_instrumentation,
+      &shared_bitmap_manager, nullptr, &task_graph_runner, 0);
 
   scoped_refptr<Layer> layer_tree_root = Layer::Create(layer_settings_);
   scoped_refptr<Layer> scroll_parent = Layer::Create(layer_settings_);
   layer_tree_root->AddChild(scroll_parent);
   layer_tree_root->AddChild(Layer::Create(layer_settings_));
   layer_tree_root->AddChild(Layer::Create(layer_settings_));
 
   host_->SetRootLayer(layer_tree_root);
 
   // First child is the second and third child's scroll parent.
@@ skipping 40 matching lines @@
   {
     SCOPED_TRACE("case three");
     ExpectTreesAreIdentical(layer_tree_root.get(),
                             layer_impl_tree_root.get(),
                             host_impl->active_tree());
   }
 }
 
 TEST_F(TreeSynchronizerTest, SynchronizeClipParent) {
   LayerTreeSettings settings;
-  FakeProxy proxy;
-  DebugScopedSetImplThread impl(&proxy);
+  FakeImplTaskRunnerProvider task_runner_provider;
   FakeRenderingStatsInstrumentation stats_instrumentation;
   TestSharedBitmapManager shared_bitmap_manager;
   TestTaskGraphRunner task_graph_runner;
   scoped_ptr<LayerTreeHostImpl> host_impl = LayerTreeHostImpl::Create(
-      settings, nullptr, &proxy, &stats_instrumentation, &shared_bitmap_manager,
-      nullptr, &task_graph_runner, 0);
+      settings, nullptr, &task_runner_provider, &stats_instrumentation,
+      &shared_bitmap_manager, nullptr, &task_graph_runner, 0);
 
   scoped_refptr<Layer> layer_tree_root = Layer::Create(layer_settings_);
   scoped_refptr<Layer> clip_parent = Layer::Create(layer_settings_);
   scoped_refptr<Layer> intervening = Layer::Create(layer_settings_);
   scoped_refptr<Layer> clip_child1 = Layer::Create(layer_settings_);
   scoped_refptr<Layer> clip_child2 = Layer::Create(layer_settings_);
   layer_tree_root->AddChild(clip_parent);
   clip_parent->AddChild(intervening);
   intervening->AddChild(clip_child1);
   intervening->AddChild(clip_child2);
@@ skipping 55 matching lines @@
                           host_impl->active_tree());
 
   // The clip children should have been unhooked.
   EXPECT_EQ(2u, intervening->children().size());
   EXPECT_FALSE(clip_child2->clip_parent());
   EXPECT_FALSE(additional_clip_child->clip_parent());
 }
 
 }  // namespace
 }  // namespace cc