cc:: Add remote mode to the compositor

cc/test/proxy_main_for_test.cc

Index: cc/test/proxy_main_for_test.cc
diff --git a/cc/test/proxy_main_for_test.cc b/cc/test/proxy_main_for_test.cc
index 4588422e09abaa642ce81edf087c8c0166170e01..4afc39e39112b18a065333f47e00b940cd515bdd 100644
--- a/cc/test/proxy_main_for_test.cc
+++ b/cc/test/proxy_main_for_test.cc
@@ -5,19 +5,34 @@
 #include "cc/test/proxy_main_for_test.h"
 
 #include "cc/test/threaded_channel_for_test.h"
+#include "cc/trees/remote_channel_main.h"
 
 namespace cc {
 
-scoped_ptr<ProxyMain> ProxyMainForTest::CreateThreaded(
+scoped_ptr<ProxyMainForTest> ProxyMainForTest::CreateThreaded(
     TestHooks* test_hooks,
     LayerTreeHost* host,
     TaskRunnerProvider* task_runner_provider,
     scoped_ptr<BeginFrameSource> external_begin_frame_source) {
-  scoped_ptr<ProxyMain> proxy_main(
+  scoped_ptr<ProxyMainForTest> proxy_main(
       new ProxyMainForTest(test_hooks, host, task_runner_provider,
                            std::move(external_begin_frame_source)));
-  proxy_main->SetChannel(ThreadedChannelForTest::Create(
-      test_hooks, proxy_main.get(), task_runner_provider));
+  scoped_ptr<ThreadedChannelForTest> channel = ThreadedChannelForTest::Create(
+      test_hooks, proxy_main.get(), task_runner_provider);
+  proxy_main->threaded_channel_for_test_ = channel.get();
+  proxy_main->SetChannel(std::move(channel));
+  return proxy_main;
+}
+
+scoped_ptr<ProxyMainForTest> ProxyMainForTest::CreateRemote(
+    TestHooks* test_hooks,
+    RemoteProtoChannel* remote_proto_channel,
+    LayerTreeHost* host,
+    TaskRunnerProvider* task_runner_provider) {
+  scoped_ptr<ProxyMainForTest> proxy_main(
+      new ProxyMainForTest(test_hooks, host, task_runner_provider, nullptr));
+  proxy_main->SetChannel(RemoteChannelMain::Create(
+      remote_proto_channel, proxy_main.get(), task_runner_provider));
   return proxy_main;
 }
 
@@ -31,7 +46,8 @@ ProxyMainForTest::ProxyMainForTest(
     : ProxyMain(host,
                 task_runner_provider,
                 std::move(external_begin_frame_source)),
-      test_hooks_(test_hooks) {}
+      test_hooks_(test_hooks),
+      threaded_channel_for_test_(nullptr) {}
 
 void ProxyMainForTest::SetNeedsUpdateLayers() {
   ProxyMain::SetNeedsUpdateLayers();