cc: Clean up LayerTreeTest and TestHooks.

cc/trees/remote_channel_impl.cc

 // Copyright 2016 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/remote_channel_impl.h"
 
 #include "base/bind_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "cc/animation/animation_events.h"
 #include "cc/proto/compositor_message.pb.h"
 #include "cc/proto/compositor_message_to_impl.pb.h"
 #include "cc/proto/compositor_message_to_main.pb.h"
 #include "cc/proto/gfx_conversions.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_settings.h"
 
 namespace cc {
 
-std::unique_ptr<RemoteChannelImpl> RemoteChannelImpl::Create(
-    LayerTreeHost* layer_tree_host,
-    RemoteProtoChannel* remote_proto_channel,
-    TaskRunnerProvider* task_runner_provider) {
-  return base::WrapUnique(new RemoteChannelImpl(
-      layer_tree_host, remote_proto_channel, task_runner_provider));
-}
-
 RemoteChannelImpl::RemoteChannelImpl(LayerTreeHost* layer_tree_host,
                                      RemoteProtoChannel* remote_proto_channel,
                                      TaskRunnerProvider* task_runner_provider)
     : task_runner_provider_(task_runner_provider),
       main_thread_vars_unsafe_(this, layer_tree_host, remote_proto_channel),
       compositor_thread_vars_unsafe_(
           main().remote_channel_weak_factory.GetWeakPtr()) {
   DCHECK(task_runner_provider_->IsMainThread());
 
   main().remote_proto_channel->SetProtoReceiver(this);
 }
 
 RemoteChannelImpl::~RemoteChannelImpl() {
   DCHECK(task_runner_provider_->IsMainThread());
   DCHECK(!main().started);
 
   main().remote_proto_channel->SetProtoReceiver(nullptr);
 }
 
 std::unique_ptr<ProxyImpl> RemoteChannelImpl::CreateProxyImpl(
     ChannelImpl* channel_impl,
     LayerTreeHost* layer_tree_host,
     TaskRunnerProvider* task_runner_provider,
     std::unique_ptr<BeginFrameSource> external_begin_frame_source) {
   DCHECK(task_runner_provider_->IsImplThread());
   DCHECK(!external_begin_frame_source);
-  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 RemoteChannelImpl::OnProtoReceived(
     std::unique_ptr<proto::CompositorMessage> proto) {
   DCHECK(task_runner_provider_->IsMainThread());
   DCHECK(main().started);
   DCHECK(proto->has_to_impl());
 
   // If we don't have an output surface, queue the message and defer processing
   // it till we initialize a new output surface.
@@ skipping 52 matching lines @@
       main().layer_tree_host->FromProtobufForCommit(
           start_commit_message.layer_tree_host());
 
       {
         DebugScopedSetMainThreadBlocked main_thread_blocked(
             task_runner_provider_);
         CompletionEvent completion;
         VLOG(1) << "Starting commit.";
         ImplThreadTaskRunner()->PostTask(
             FROM_HERE,
-            base::Bind(&ProxyImpl::StartCommitOnImpl, proxy_impl_weak_ptr_,
-                       &completion, main().layer_tree_host,
-                       main_thread_start_time, false));
+            base::Bind(&ProxyImpl::NotifyReadyToCommitOnImpl,
+                       proxy_impl_weak_ptr_, &completion,
+                       main().layer_tree_host, main_thread_start_time, false));
         completion.Wait();
       }
     } break;
     case proto::CompositorMessageToImpl::BEGIN_MAIN_FRAME_ABORTED: {
       base::TimeTicks main_thread_start_time = base::TimeTicks::Now();
       const proto::BeginMainFrameAborted& begin_main_frame_aborted_message =
           proto.begin_main_frame_aborted_message();
       CommitEarlyOutReason reason = CommitEarlyOutReasonFromProtobuf(
           begin_main_frame_aborted_message.reason());
       VLOG(1) << "Received BeginMainFrameAborted from the engine with reason: "
@@ skipping 402 matching lines @@
 
 RemoteChannelImpl::CompositorThreadOnly::CompositorThreadOnly(
     base::WeakPtr<RemoteChannelImpl> remote_channel_weak_ptr)
     : proxy_impl(nullptr),
       proxy_impl_weak_factory(nullptr),
       remote_channel_weak_ptr(remote_channel_weak_ptr) {}
 
 RemoteChannelImpl::CompositorThreadOnly::~CompositorThreadOnly() {}
 
 }  // namespace cc