| Index: cc/trees/layer_tree_host.cc
|
| diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
|
| index 6eb60f64390c425fec8fd98fad4578c69f8b21cf..b5f02316cb0c194a0a208b0e39aeae8e42f4b338 100644
|
| --- a/cc/trees/layer_tree_host.cc
|
| +++ b/cc/trees/layer_tree_host.cc
|
| @@ -42,8 +42,8 @@
|
| #include "cc/trees/layer_tree_host_common.h"
|
| #include "cc/trees/layer_tree_host_impl.h"
|
| #include "cc/trees/layer_tree_impl.h"
|
| -#include "cc/trees/proxy_main.h"
|
| #include "cc/trees/single_thread_proxy.h"
|
| +#include "cc/trees/thread_proxy.h"
|
| #include "cc/trees/tree_synchronizer.h"
|
| #include "ui/gfx/geometry/size_conversions.h"
|
| #include "ui/gfx/geometry/vector2d_conversions.h"
|
| @@ -143,10 +143,8 @@
|
| scoped_ptr<BeginFrameSource> external_begin_frame_source) {
|
| task_runner_provider_ =
|
| TaskRunnerProvider::Create(main_task_runner, impl_task_runner);
|
| - scoped_ptr<ProxyMain> proxy_main =
|
| - ProxyMain::CreateThreaded(this, task_runner_provider_.get(),
|
| - std::move(external_begin_frame_source));
|
| - InitializeProxy(std::move(proxy_main));
|
| + InitializeProxy(ThreadProxy::Create(this, task_runner_provider_.get(),
|
| + std::move(external_begin_frame_source)));
|
| }
|
|
|
| void LayerTreeHost::InitializeSingleThreaded(
|
|
|