[NOT LANDED] Revert of cc: Split ThreadProxy into ProxyMain and ProxyImpl

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
deleted file mode 100644
index bd74790473218d80c92939e5fb22358035e3397d..0000000000000000000000000000000000000000
--- a/cc/test/threaded_channel_for_test.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#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 {
-
-// ThreadedChannel that notifies |test_hooks| of internal actions by ProxyImpl.
-class ThreadedChannelForTest : public ThreadedChannel {
- public:
-  static scoped_ptr<ThreadedChannel> Create(
-      TestHooks* test_hooks,
-      ProxyMain* proxy_main,
-      TaskRunnerProvider* task_runner_provider);
-
- private:
-  ThreadedChannelForTest(TestHooks* test_hooks,
-                         ProxyMain* proxy_main,
-                         TaskRunnerProvider* task_runner_provider);
-
-  scoped_ptr<ProxyImpl> CreateProxyImpl(
-      ChannelImpl* channel_impl,
-      LayerTreeHost* layer_tree_host,
-      TaskRunnerProvider* task_runner_provider,
-      scoped_ptr<BeginFrameSource> external_begin_frame_source) override;
-
-  TestHooks* test_hooks_;
-};
-
-}  // namespace cc
-
-#endif  // CC_TEST_THREADED_CHANNEL_FOR_TEST_H_