| Index: cc/test/proxy_main_for_test.h
|
| diff --git a/cc/test/proxy_main_for_test.h b/cc/test/proxy_main_for_test.h
|
| index 1669cc5a56b831e5399f41f57e19ef7929d090ac..d749d4f59970e7b3ab988eec32160bcf31c7cf6f 100644
|
| --- a/cc/test/proxy_main_for_test.h
|
| +++ b/cc/test/proxy_main_for_test.h
|
| @@ -10,17 +10,24 @@
|
| #include "cc/trees/proxy_main.h"
|
|
|
| namespace cc {
|
| +class ThreadedChannelForTest;
|
|
|
| // Creates a ProxyMain that notifies the supplied |test_hooks| of various
|
| // actions.
|
| class ProxyMainForTest : public ProxyMain {
|
| public:
|
| - static scoped_ptr<ProxyMain> CreateThreaded(
|
| + static scoped_ptr<ProxyMainForTest> CreateThreaded(
|
| TestHooks* test_hooks,
|
| LayerTreeHost* host,
|
| TaskRunnerProvider* task_runner_provider,
|
| scoped_ptr<BeginFrameSource> external_begin_frame_source);
|
|
|
| + static scoped_ptr<ProxyMainForTest> CreateRemote(
|
| + TestHooks* test_hooks,
|
| + RemoteProtoChannel* remote_proto_channel,
|
| + LayerTreeHost* host,
|
| + TaskRunnerProvider* task_runner_provider);
|
| +
|
| ~ProxyMainForTest() override;
|
|
|
| ProxyMainForTest(TestHooks* test_hooks,
|
| @@ -28,6 +35,10 @@ class ProxyMainForTest : public ProxyMain {
|
| TaskRunnerProvider* task_runner_provider,
|
| scoped_ptr<BeginFrameSource> external_begin_frame_source);
|
|
|
| + ThreadedChannelForTest* threaded_channel_for_test() const {
|
| + return threaded_channel_for_test_;
|
| + }
|
| +
|
| void SetNeedsUpdateLayers() override;
|
| void DidCompleteSwapBuffers() override;
|
| void SetRendererCapabilities(
|
| @@ -49,6 +60,7 @@ class ProxyMainForTest : public ProxyMain {
|
| scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) override;
|
|
|
| TestHooks* test_hooks_;
|
| + ThreadedChannelForTest* threaded_channel_for_test_;
|
| };
|
|
|
| } // namespace cc
|
|
|