cc: Split Proxy and TaskRunnerProvider for the LayerTreeHost

cc/test/layer_tree_test.h

 // 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.
 
 #ifndef CC_TEST_LAYER_TREE_TEST_H_
 #define CC_TEST_LAYER_TREE_TEST_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
 #include "cc/animation/animation_delegate.h"
@@ skipping 235 matching lines @@
 
   virtual void AfterTest() = 0;
   virtual void WillBeginTest();
   virtual void BeginTest() = 0;
   virtual void SetupTree();
 
   virtual void RunTest(bool threaded, bool delegating_renderer);
 
   bool HasImplThread() { return !!impl_thread_; }
   base::SingleThreadTaskRunner* ImplThreadTaskRunner() {
-    DCHECK(proxy());
-    return proxy()->ImplThreadTaskRunner() ? proxy()->ImplThreadTaskRunner()
-                                           : main_task_runner_.get();
+    DCHECK(task_runner_provider());
+    base::SingleThreadTaskRunner* impl_thread_task_runner =
+        task_runner_provider()->ImplThreadTaskRunner();
+    return impl_thread_task_runner ? impl_thread_task_runner
+                                   : main_task_runner_.get();
   }
   base::SingleThreadTaskRunner* MainThreadTaskRunner() {
     return main_task_runner_.get();
   }
   Proxy* proxy() const {
     return layer_tree_host_ ? layer_tree_host_->proxy() : NULL;
   }
+  TaskRunnerProvider* task_runner_provider() const {
+    return layer_tree_host_ ? layer_tree_host_->task_runner_provider()
+                            : nullptr;
+  }
   TaskGraphRunner* task_graph_runner() const {
     return task_graph_runner_.get();
   }
 
   bool TestEnded() const { return ended_; }
 
   LayerTreeHost* layer_tree_host();
   bool delegating_renderer() const { return delegating_renderer_; }
   FakeOutputSurface* output_surface() { return output_surface_; }
   int LastCommittedSourceFrameNumber(LayerTreeHostImpl* impl) const;
@@ skipping 89 matching lines @@
 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)            \
   SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \
   SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME)
 
 // Some tests want to control when notify ready for activation occurs,
 // but this is not supported in the single-threaded case.
 #define MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \
   MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
 
 #endif  // CC_TEST_LAYER_TREE_TEST_H_