cc: Clean up LayerTreeTest and TestHooks.

cc/trees/threaded_channel.cc

 // Copyright 2015 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.
 
 #include "cc/trees/threaded_channel.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 121 matching lines @@
 void ThreadedChannel::MainFrameWillHappenOnImplForTesting(
     CompletionEvent* completion,
     bool* main_frame_will_happen) {
   DCHECK(IsMainThread());
   ImplThreadTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&ProxyImpl::MainFrameWillHappenOnImplForTesting,
                  proxy_impl_weak_ptr_, completion, main_frame_will_happen));
 }
 
-void ThreadedChannel::StartCommitOnImpl(CompletionEvent* completion,
-                                        LayerTreeHost* layer_tree_host,
-                                        base::TimeTicks main_thread_start_time,
-                                        bool hold_commit_for_activation) {
+void ThreadedChannel::NotifyReadyToCommitOnImpl(
+    CompletionEvent* completion,
+    LayerTreeHost* layer_tree_host,
+    base::TimeTicks main_thread_start_time,
+    bool hold_commit_for_activation) {
   DCHECK(IsMainThread());
   ImplThreadTaskRunner()->PostTask(
-      FROM_HERE, base::Bind(&ProxyImpl::StartCommitOnImpl, proxy_impl_weak_ptr_,
-                            completion, layer_tree_host, main_thread_start_time,
-                            hold_commit_for_activation));
+      FROM_HERE,
+      base::Bind(&ProxyImpl::NotifyReadyToCommitOnImpl, proxy_impl_weak_ptr_,
+                 completion, layer_tree_host, main_thread_start_time,
+                 hold_commit_for_activation));
 }
 
 void ThreadedChannel::SynchronouslyInitializeImpl(
     LayerTreeHost* layer_tree_host,
     std::unique_ptr<BeginFrameSource> external_begin_frame_source) {
   TRACE_EVENT0("cc", "ThreadChannel::SynchronouslyInitializeImpl");
   DCHECK(IsMainThread());
   {
     DebugScopedSetMainThreadBlocked main_thread_blocked(task_runner_provider_);
     CompletionEvent completion;
@@ skipping 110 matching lines @@
       base::Bind(&ProxyMain::BeginMainFrame, impl().proxy_main_weak_ptr,
                  base::Passed(&begin_main_frame_state)));
 }
 
 std::unique_ptr<ProxyImpl> ThreadedChannel::CreateProxyImpl(
     ChannelImpl* channel_impl,
     LayerTreeHost* layer_tree_host,
     TaskRunnerProvider* task_runner_provider,
     std::unique_ptr<BeginFrameSource> external_begin_frame_source) {
   DCHECK(IsImplThread());
-  return ProxyImpl::Create(channel_impl, layer_tree_host, task_runner_provider,
-                           std::move(external_begin_frame_source));
+  return base::MakeUnique<ProxyImpl>(channel_impl, layer_tree_host,
+                                     task_runner_provider,
+                                     std::move(external_begin_frame_source));
 }
 
 void ThreadedChannel::InitializeImplOnImpl(
     CompletionEvent* completion,
     LayerTreeHost* layer_tree_host,
     std::unique_ptr<BeginFrameSource> external_begin_frame_source) {
   DCHECK(IsImplThread());
   impl().proxy_impl =
       CreateProxyImpl(this, layer_tree_host, task_runner_provider_,
                       std::move(external_begin_frame_source));
@@ skipping 59 matching lines @@
 
 ThreadedChannel::MainThreadOnly::~MainThreadOnly() {}
 
 ThreadedChannel::CompositorThreadOnly::CompositorThreadOnly(
     base::WeakPtr<ProxyMain> proxy_main_weak_ptr)
     : proxy_main_weak_ptr(proxy_main_weak_ptr) {}
 
 ThreadedChannel::CompositorThreadOnly::~CompositorThreadOnly() {}
 
 }  // namespace cc