| Index: cc/debug/frame_timing_tracker_unittest.cc
|
| diff --git a/cc/debug/frame_timing_tracker_unittest.cc b/cc/debug/frame_timing_tracker_unittest.cc
|
| index 218927cf26ad1451e63304e8290ff0ee57397b64..7383497742585c180199ac7fa8929035eee78621 100644
|
| --- a/cc/debug/frame_timing_tracker_unittest.cc
|
| +++ b/cc/debug/frame_timing_tracker_unittest.cc
|
| @@ -9,7 +9,7 @@
|
| #include "base/trace_event/trace_event_argument.h"
|
| #include "base/values.h"
|
| #include "cc/debug/frame_timing_tracker.h"
|
| -#include "cc/test/fake_impl_proxy.h"
|
| +#include "cc/test/fake_impl_task_runner_provider.h"
|
| #include "cc/test/fake_layer_tree_host_impl.h"
|
| #include "cc/test/test_shared_bitmap_manager.h"
|
| #include "cc/test/test_task_graph_runner.h"
|
| @@ -74,10 +74,10 @@ std::string MainFrameToString(
|
| }
|
|
|
| TEST(FrameTimingTrackerTest, DefaultTrackerIsEmpty) {
|
| - FakeImplProxy proxy;
|
| + FakeImplTaskRunnerProvider task_runner_provider;
|
| TestSharedBitmapManager shared_bitmap_manager;
|
| TestTaskGraphRunner task_graph_runner;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager,
|
| + FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
|
| &task_graph_runner);
|
|
|
| scoped_ptr<FrameTimingTracker> tracker(
|
| @@ -89,10 +89,10 @@ TEST(FrameTimingTrackerTest, DefaultTrackerIsEmpty) {
|
| }
|
|
|
| TEST(FrameTimingTrackerTest, NoFrameIdsIsEmpty) {
|
| - FakeImplProxy proxy;
|
| + FakeImplTaskRunnerProvider task_runner_provider;
|
| TestSharedBitmapManager shared_bitmap_manager;
|
| TestTaskGraphRunner task_graph_runner;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager,
|
| + FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
|
| &task_graph_runner);
|
|
|
| scoped_ptr<FrameTimingTracker> tracker(
|
| @@ -104,10 +104,10 @@ TEST(FrameTimingTrackerTest, NoFrameIdsIsEmpty) {
|
| }
|
|
|
| TEST(FrameTimingTrackerTest, NoRectIdsYieldsNoMainFrameEvents) {
|
| - FakeImplProxy proxy;
|
| + FakeImplTaskRunnerProvider task_runner_provider;
|
| TestSharedBitmapManager shared_bitmap_manager;
|
| TestTaskGraphRunner task_graph_runner;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager,
|
| + FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
|
| &task_graph_runner);
|
|
|
| scoped_ptr<FrameTimingTracker> tracker(
|
| @@ -120,10 +120,10 @@ TEST(FrameTimingTrackerTest, NoRectIdsYieldsNoMainFrameEvents) {
|
| }
|
|
|
| TEST(FrameTimingTrackerTest, OneFrameId) {
|
| - FakeImplProxy proxy;
|
| + FakeImplTaskRunnerProvider task_runner_provider;
|
| TestSharedBitmapManager shared_bitmap_manager;
|
| TestTaskGraphRunner task_graph_runner;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager,
|
| + FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
|
| &task_graph_runner);
|
|
|
| scoped_ptr<FrameTimingTracker> tracker(
|
| @@ -138,10 +138,10 @@ TEST(FrameTimingTrackerTest, OneFrameId) {
|
| }
|
|
|
| TEST(FrameTimingTrackerTest, OneMainFrameRect) {
|
| - FakeImplProxy proxy;
|
| + FakeImplTaskRunnerProvider task_runner_provider;
|
| TestSharedBitmapManager shared_bitmap_manager;
|
| TestTaskGraphRunner task_graph_runner;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager,
|
| + FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
|
| &task_graph_runner);
|
|
|
| scoped_ptr<FrameTimingTracker> tracker(
|
| @@ -158,10 +158,10 @@ TEST(FrameTimingTrackerTest, OneMainFrameRect) {
|
| }
|
|
|
| TEST(FrameTimingTrackerTest, UnsortedTimestampsIds) {
|
| - FakeImplProxy proxy;
|
| + FakeImplTaskRunnerProvider task_runner_provider;
|
| TestSharedBitmapManager shared_bitmap_manager;
|
| TestTaskGraphRunner task_graph_runner;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager,
|
| + FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
|
| &task_graph_runner);
|
|
|
| scoped_ptr<FrameTimingTracker> tracker(
|
| @@ -180,10 +180,10 @@ TEST(FrameTimingTrackerTest, UnsortedTimestampsIds) {
|
| }
|
|
|
| TEST(FrameTimingTrackerTest, MainFrameUnsortedTimestamps) {
|
| - FakeImplProxy proxy;
|
| + FakeImplTaskRunnerProvider task_runner_provider;
|
| TestSharedBitmapManager shared_bitmap_manager;
|
| TestTaskGraphRunner task_graph_runner;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager,
|
| + FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
|
| &task_graph_runner);
|
|
|
| scoped_ptr<FrameTimingTracker> tracker(
|
| @@ -208,10 +208,10 @@ TEST(FrameTimingTrackerTest, MainFrameUnsortedTimestamps) {
|
| }
|
|
|
| TEST(FrameTimingTrackerTest, MultipleFrameIds) {
|
| - FakeImplProxy proxy;
|
| + FakeImplTaskRunnerProvider task_runner_provider;
|
| TestSharedBitmapManager shared_bitmap_manager;
|
| TestTaskGraphRunner task_graph_runner;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager,
|
| + FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
|
| &task_graph_runner);
|
|
|
| scoped_ptr<FrameTimingTracker> tracker(
|
| @@ -247,10 +247,10 @@ TEST(FrameTimingTrackerTest, MultipleFrameIds) {
|
| }
|
|
|
| TEST(FrameTimingTrackerTest, MultipleMainFrameEvents) {
|
| - FakeImplProxy proxy;
|
| + FakeImplTaskRunnerProvider task_runner_provider;
|
| TestSharedBitmapManager shared_bitmap_manager;
|
| TestTaskGraphRunner task_graph_runner;
|
| - FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager,
|
| + FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
|
| &task_graph_runner);
|
|
|
| scoped_ptr<FrameTimingTracker> tracker(
|
|
|