cc: Clean up LayerTreeTest and TestHooks.

cc/test/threaded_channel_for_test.h

Index: cc/test/threaded_channel_for_test.h
diff --git a/cc/test/threaded_channel_for_test.h b/cc/test/threaded_channel_for_test.h
index f48423a0ce060a6d56cbfa3a2b2d9a9d8f8fcc79..b9ec7d4e31a73874ccc2dcccfe386209fcfb52d1 100644
--- a/cc/test/threaded_channel_for_test.h
+++ b/cc/test/threaded_channel_for_test.h
@@ -5,36 +5,27 @@
 #ifndef CC_TEST_THREADED_CHANNEL_FOR_TEST_H_
 #define CC_TEST_THREADED_CHANNEL_FOR_TEST_H_
 
-#include "base/macros.h"
-#include "cc/test/test_hooks.h"
 #include "cc/trees/threaded_channel.h"
 
 namespace cc {
-class ProxyImplForTest;
 
-// ThreadedChannel that notifies |test_hooks| of internal actions by ProxyImpl.
 class ThreadedChannelForTest : public ThreadedChannel {
  public:
-  static std::unique_ptr<ThreadedChannelForTest> Create(
-      TestHooks* test_hooks,
-      ProxyMain* proxy_main,
-      TaskRunnerProvider* task_runner_provider);
-
-  ProxyImplForTest* proxy_impl_for_test() { return proxy_impl_for_test_; }
-
- private:
-  ThreadedChannelForTest(TestHooks* test_hooks,
-                         ProxyMain* proxy_main,
+  ThreadedChannelForTest(ProxyMain* proxy_main,
                          TaskRunnerProvider* task_runner_provider);
 
+  ProxyImpl* proxy_impl() { return proxy_impl_; }
+
+ protected:
+  // ThreadedChannel overrides.
   std::unique_ptr<ProxyImpl> CreateProxyImpl(
       ChannelImpl* channel_impl,
       LayerTreeHost* layer_tree_host,
       TaskRunnerProvider* task_runner_provider,
       std::unique_ptr<BeginFrameSource> external_begin_frame_source) override;
 
-  TestHooks* test_hooks_;
-  ProxyImplForTest* proxy_impl_for_test_;
+ private:
+  ProxyImpl* proxy_impl_ = nullptr;
 };
 
 }  // namespace cc