cc: Activate sync tree instead of pending tree.

This patch does not change anything functionally. It prepares
us to skip pending tree for commit. It essentially unifies
the activation for both impl-side and non-impl-side painting
paths.

BUG=383157

Review URL: https://codereview.chromium.org/345563011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280717 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 12 deletions

diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index 3437f8c..51ab193 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -159,16 +159,6 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
 
   virtual void CommitComplete() OVERRIDE {
     LayerTreeHostImpl::CommitComplete();
-
-    // A few tests count the number of times pending tree is activated.
-    // When not using impl-side painting, ActivatePendingTree is not called,
-    // so call these test hooks functions explicitly so that they do need
-    // to handle non-impl-side path explicitly.
-    if (!settings().impl_side_painting) {
-      test_hooks_->WillActivateTreeOnThread(this);
-      test_hooks_->DidActivateTreeOnThread(this);
-    }
-
     test_hooks_->CommitCompleteOnThread(this);
   }
 
@@ -218,9 +208,9 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
     }
   }
 
-  virtual void ActivatePendingTree() OVERRIDE {
+  virtual void ActivateSyncTree() OVERRIDE {
     test_hooks_->WillActivateTreeOnThread(this);
-    LayerTreeHostImpl::ActivatePendingTree();
+    LayerTreeHostImpl::ActivateSyncTree();
     DCHECK(!pending_tree());
     test_hooks_->DidActivateTreeOnThread(this);
   }