| Index: cc/test/remote_compositor_test.cc
|
| diff --git a/cc/test/remote_compositor_test.cc b/cc/test/remote_compositor_test.cc
|
| index 765224990b5dd9f66928db105eb03e84de0ae5a1..cb1af48cfa427647aed595c41ad67eac47baa05d 100644
|
| --- a/cc/test/remote_compositor_test.cc
|
| +++ b/cc/test/remote_compositor_test.cc
|
| @@ -60,11 +60,13 @@ void RemoteCompositorTest::SetUp() {
|
| params.client = &layer_tree_host_client_remote_;
|
| params.main_task_runner = main_task_runner;
|
| params.mutator_host = animation_host_.get();
|
| - params.remote_compositor_bridge =
|
| + std::unique_ptr<RemoteCompositorBridgeForTest> bridge_for_test =
|
| base::MakeUnique<RemoteCompositorBridgeForTest>(
|
| main_task_runner,
|
| base::Bind(&RemoteCompositorTest::ProcessCompositorStateUpdate,
|
| base::Unretained(this)));
|
| + fake_remote_compositor_bridge_ = bridge_for_test.get();
|
| + params.remote_compositor_bridge = std::move(bridge_for_test);
|
| params.engine_picture_cache =
|
| image_serialization_processor_.CreateEnginePictureCache();
|
| LayerTreeSettings settings;
|
| @@ -89,6 +91,7 @@ void RemoteCompositorTest::SetUp() {
|
| }
|
|
|
| void RemoteCompositorTest::TearDown() {
|
| + fake_remote_compositor_bridge_ = nullptr;
|
| layer_tree_host_remote_ = nullptr;
|
| compositor_state_deserializer_ = nullptr;
|
| layer_tree_host_in_process_ = nullptr;
|
| @@ -111,6 +114,11 @@ void RemoteCompositorTest::ApplyViewportDeltas(
|
| top_controls_delta);
|
| }
|
|
|
| +bool RemoteCompositorTest::HasPendingUpdate() const {
|
| + DCHECK(fake_remote_compositor_bridge_);
|
| + return fake_remote_compositor_bridge_->has_pending_update();
|
| +}
|
| +
|
| void RemoteCompositorTest::ProcessCompositorStateUpdate(
|
| std::unique_ptr<CompositorProtoState> compositor_proto_state) {
|
| compositor_state_deserializer_->DeserializeCompositorUpdate(
|
|
|