| Index: cc/test/layer_tree_test.cc
|
| diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
|
| index 0be1ed1167b321169ec135f5de6f2aabe348cd25..582e6b01615e920dd0b56f98da71b2896b968787 100644
|
| --- a/cc/test/layer_tree_test.cc
|
| +++ b/cc/test/layer_tree_test.cc
|
| @@ -107,7 +107,7 @@ class ThreadProxyForTest : public ThreadProxy {
|
| };
|
|
|
| // Adapts LayerTreeHostImpl for test. Runs real code, then invokes test hooks.
|
| -class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
|
| +class LayerTreeHostImplForTesting : public PseudoSyncingLayerTreeHostImpl {
|
| public:
|
| static scoped_ptr<LayerTreeHostImplForTesting> Create(
|
| TestHooks* test_hooks,
|
| @@ -133,12 +133,12 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
|
| Proxy* proxy,
|
| SharedBitmapManager* manager,
|
| RenderingStatsInstrumentation* stats_instrumentation)
|
| - : LayerTreeHostImpl(settings,
|
| - host_impl_client,
|
| - proxy,
|
| - stats_instrumentation,
|
| - manager,
|
| - 0),
|
| + : PseudoSyncingLayerTreeHostImpl(settings,
|
| + host_impl_client,
|
| + proxy,
|
| + stats_instrumentation,
|
| + manager,
|
| + 0),
|
| test_hooks_(test_hooks),
|
| block_notify_ready_to_activate_for_testing_(false),
|
| notify_ready_to_activate_was_blocked_(false) {}
|
| @@ -748,4 +748,8 @@ void LayerTreeTest::DestroyLayerTreeHost() {
|
| layer_tree_host_.reset();
|
| }
|
|
|
| +bool PseudoSyncingLayerTreeHostImpl::IsTesting() {
|
| + return true;
|
| +}
|
| +
|
| } // namespace cc
|
|
|