cc: Clean up LayerTreeTest and TestHooks.

cc/test/threaded_channel_for_test.cc

Index: cc/test/threaded_channel_for_test.cc
diff --git a/cc/test/threaded_channel_for_test.cc b/cc/test/threaded_channel_for_test.cc
index ecfd5ca6ee18b22dc5f3cabf635d9900ad927c08..6deaac6b5748dbcc85c2c00642117d59aaf42108 100644
--- a/cc/test/threaded_channel_for_test.cc
+++ b/cc/test/threaded_channel_for_test.cc
@@ -5,36 +5,25 @@
 #include "cc/test/threaded_channel_for_test.h"
 
 #include "base/memory/ptr_util.h"
-#include "cc/test/proxy_impl_for_test.h"
+#include "cc/trees/proxy_impl.h"
 
 namespace cc {
 
-std::unique_ptr<ThreadedChannelForTest> ThreadedChannelForTest::Create(
-    TestHooks* test_hooks,
-    ProxyMain* proxy_main,
-    TaskRunnerProvider* task_runner_provider) {
-  return base::WrapUnique(
-      new ThreadedChannelForTest(test_hooks, proxy_main, task_runner_provider));
-}
-
 ThreadedChannelForTest::ThreadedChannelForTest(
-    TestHooks* test_hooks,
     ProxyMain* proxy_main,
     TaskRunnerProvider* task_runner_provider)
-    : ThreadedChannel(proxy_main, task_runner_provider),
-      test_hooks_(test_hooks),
-      proxy_impl_for_test_(nullptr) {}
+    : ThreadedChannel(proxy_main, task_runner_provider) {}
 
 std::unique_ptr<ProxyImpl> ThreadedChannelForTest::CreateProxyImpl(
     ChannelImpl* channel_impl,
     LayerTreeHost* layer_tree_host,
     TaskRunnerProvider* task_runner_provider,
     std::unique_ptr<BeginFrameSource> external_begin_frame_source) {
-  std::unique_ptr<ProxyImplForTest> proxy_impl = ProxyImplForTest::Create(
-      test_hooks_, channel_impl, layer_tree_host, task_runner_provider,
+  std::unique_ptr<ProxyImpl> proxy_impl = base::MakeUnique<ProxyImpl>(
+      channel_impl, layer_tree_host, task_runner_provider,
       std::move(external_begin_frame_source));
-  proxy_impl_for_test_ = proxy_impl.get();
-  return std::move(proxy_impl);
+  proxy_impl_ = proxy_impl.get();
+  return proxy_impl;
 }
 
 }  // namespace cc