| Index: cc/debug/micro_benchmark_controller_unittest.cc
|
| diff --git a/cc/debug/micro_benchmark_controller_unittest.cc b/cc/debug/micro_benchmark_controller_unittest.cc
|
| index 61f34f4b77ea3000a4f44a5e143b805da9a37b4e..c569d863858260a7e1d8121e2461aec4bb628eae 100644
|
| --- a/cc/debug/micro_benchmark_controller_unittest.cc
|
| +++ b/cc/debug/micro_benchmark_controller_unittest.cc
|
| @@ -7,9 +7,9 @@
|
| #include "cc/debug/micro_benchmark.h"
|
| #include "cc/debug/micro_benchmark_controller.h"
|
| #include "cc/layers/layer.h"
|
| +#include "cc/test/fake_impl_thread_verifier.h"
|
| #include "cc/test/fake_layer_tree_host.h"
|
| #include "cc/test/fake_layer_tree_host_impl.h"
|
| -#include "cc/test/fake_proxy.h"
|
| #include "cc/test/test_task_graph_runner.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -22,9 +22,10 @@ class MicroBenchmarkControllerTest : public testing::Test {
|
| : layer_tree_host_client_(FakeLayerTreeHostClient::DIRECT_3D) {}
|
|
|
| void SetUp() override {
|
| - impl_proxy_ = make_scoped_ptr(new FakeImplProxy);
|
| + impl_thread_verifier_ = make_scoped_ptr(new FakeImplThreadVerifier);
|
| layer_tree_host_impl_ = make_scoped_ptr(new FakeLayerTreeHostImpl(
|
| - impl_proxy_.get(), &shared_bitmap_manager_, &task_graph_runner_));
|
| + impl_thread_verifier_.get(), &shared_bitmap_manager_,
|
| + &task_graph_runner_));
|
|
|
| layer_tree_host_ = FakeLayerTreeHost::Create(&layer_tree_host_client_,
|
| &task_graph_runner_);
|
| @@ -35,7 +36,7 @@ class MicroBenchmarkControllerTest : public testing::Test {
|
| void TearDown() override {
|
| layer_tree_host_impl_ = nullptr;
|
| layer_tree_host_ = nullptr;
|
| - impl_proxy_ = nullptr;
|
| + impl_thread_verifier_ = nullptr;
|
| }
|
|
|
| FakeLayerTreeHostClient layer_tree_host_client_;
|
| @@ -43,7 +44,7 @@ class MicroBenchmarkControllerTest : public testing::Test {
|
| TestSharedBitmapManager shared_bitmap_manager_;
|
| scoped_ptr<FakeLayerTreeHost> layer_tree_host_;
|
| scoped_ptr<FakeLayerTreeHostImpl> layer_tree_host_impl_;
|
| - scoped_ptr<FakeImplProxy> impl_proxy_;
|
| + scoped_ptr<FakeImplThreadVerifier> impl_thread_verifier_;
|
| };
|
|
|
| void Noop(scoped_ptr<base::Value> value) {
|
|
|