cc: Clean up LayerTreeTest and TestHooks.

cc/trees/proxy_impl.cc

Index: cc/trees/proxy_impl.cc
diff --git a/cc/trees/proxy_impl.cc b/cc/trees/proxy_impl.cc
index cf0dd57bb0b10839f4ab37f704fba30c04ee407e..1dbf386b75cdeee69c86ba408075633ef685f5aa 100644
--- a/cc/trees/proxy_impl.cc
+++ b/cc/trees/proxy_impl.cc
@@ -36,16 +36,6 @@ unsigned int nextBeginFrameId = 0;
 
 }  // namespace
 
-std::unique_ptr<ProxyImpl> ProxyImpl::Create(
-    ChannelImpl* channel_impl,
-    LayerTreeHost* layer_tree_host,
-    TaskRunnerProvider* task_runner_provider,
-    std::unique_ptr<BeginFrameSource> external_begin_frame_source) {
-  return base::WrapUnique(
-      new ProxyImpl(channel_impl, layer_tree_host, task_runner_provider,
-                    std::move(external_begin_frame_source)));
-}
-
 ProxyImpl::ProxyImpl(
     ChannelImpl* channel_impl,
     LayerTreeHost* layer_tree_host,
@@ -72,6 +62,10 @@ ProxyImpl::ProxyImpl(
   DCHECK(IsImplThread());
   DCHECK(IsMainThreadBlocked());
 
+  // Double checking we set this correctly since double->int truncations are
+  // silent and have been done mistakenly: crbug.com/568120.
+  DCHECK(!smoothness_priority_expiration_notifier_.delay().is_zero());
+
   layer_tree_host_impl_ = layer_tree_host->CreateLayerTreeHostImpl(this);
 
   SchedulerSettings scheduler_settings(
@@ -256,16 +250,6 @@ void ProxyImpl::MainFrameWillHappenOnImplForTesting(
   completion->Signal();
 }
 
-void ProxyImpl::BlockNotifyReadyToActivateForTesting(bool block) {
-  DCHECK(IsImplThread());
-  layer_tree_host_impl_->BlockNotifyReadyToActivateForTesting(block);
-}
-
-CompletionEvent* ProxyImpl::ActivationCompletionEventForTesting() {
-  DCHECK(IsImplThread());
-  return activation_completion_event_;
-}
-
 void ProxyImpl::StartCommitOnImpl(CompletionEvent* completion,
                                   LayerTreeHost* layer_tree_host,
                                   base::TimeTicks main_thread_start_time,
@@ -287,6 +271,8 @@ void ProxyImpl::StartCommitOnImpl(CompletionEvent* completion,
   // But, we can avoid a PostTask in here.
   scheduler_->NotifyBeginMainFrameStarted(main_thread_start_time);
 
+  layer_tree_host_impl_->BeginMainFrameCompleted();

[enne (OOO), 2016/07/18 21:48:02]

Just from a readability perspective, it's a little weird to have this here.  I
would have expected BeginMainFrameCompleted to occur at the end of
BeginMainFrame, and anything happening here to be called StartCommitOnImpl, as
it was called before.

[danakj, 2016/07/18 23:20:10]

It needs to happen before NotifyReadyToCommit and on the impl thread. This
translates to BeginMainFrameCompletedOnThread() in tests which is more clear
(the OnThread part is kinda implicit here).

It's 1:1 with the NotifyBeginMainFrameStarted() to the scheduler, which is to
say main frame is done on the thread.

This function is called StartCommitOnImpl for historical reasons, but it won't
really start a commit, it's more like
"MainThreadIsBlockedAndMainFrameIsDoneOnImpl" or something. Maybe I should
rename it to just BeginMainFrameCompletedOnImpl?

[enne (OOO), 2016/07/19 01:08:59]

DidStartCommitOnImpl?

[danakj, 2016/07/19 01:36:37]

I mean, should I rename the method on ProxyImpl to
ProxyImpl::BeginMainFrameCmopletedOnImpl?

I don't want to call the hook CommitStarted or similar, cuz that's not what this
is. This is the main thread saying it's blocked. Commit happens separately from
this when we deem it worthy. And we have a BeginCommitOnThread hook for that.

+
   commit_completion_event_ = completion;
   commit_completion_waits_for_activation_ = hold_commit_for_activation;