Send takeover msg from MT to CC using the animation path.

cc/trees/layer_tree_host_unittest_animation.cc

 // Copyright 2012 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/layer_tree_host.h"
 
 #include <stdint.h>
 
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/animation_host.h"
@@ skipping 761 matching lines @@
 
     AttachPlayersToTimeline();
     player_child_->AttachElement(scroll_layer_->id());
     // Allows NotifyAnimationTakeover to get called.
     player_child_->set_animation_delegate(this);
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void DidCommit() override {
-    // Add a main thread scrolling reason after the first commit to trigger
-    // the takeover path.
     if (layer_tree_host()->source_frame_number() == 1) {
-      scroll_layer_->AddMainThreadScrollingReasons(
-          MainThreadScrollingReason::kHasNonLayerViewportConstrainedObjects);
+      // Add an update after the first commit to trigger the animation takeover
+      // path.
+      layer_tree_host()
+          ->animation_host()
+          ->scroll_offset_animations()
+          .AddTakeoverUpdate(scroll_layer_->id());
+      EXPECT_TRUE(layer_tree_host()
+                      ->animation_host()
+                      ->scroll_offset_animations()
+                      .HasUpdatesForTesting());
     }
   }
 
   void WillCommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
     if (host_impl->sync_tree()->source_frame_number() == 0) {
       host_impl->animation_host()->ImplOnlyScrollAnimationCreate(
           scroll_layer_->id(), gfx::ScrollOffset(650.f, 750.f),
           gfx::ScrollOffset(10, 20));
     }
   }
@@ skipping 33 matching lines @@
     AttachPlayersToTimeline();
     player_child_->AttachElement(scroll_layer_->id());
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void DidCommit() override {
     if (layer_tree_host()->source_frame_number() == 1) {
       // Add an update after the first commit to trigger the animation update
       // path.
-      ScrollOffsetAnimationUpdate update(
-          ScrollOffsetAnimationUpdate::Type::SCROLL_OFFSET_CHANGED,
-          scroll_layer_->id());
-      update.adjustment_ = gfx::Vector2dF(100.f, 100.f);
-      layer_tree_host()->animation_host()->scroll_offset_animations().AddUpdate(
-          update);
+      layer_tree_host()
+          ->animation_host()
+          ->scroll_offset_animations()
+          .AddAdjustmentUpdate(scroll_layer_->id(),
+                               gfx::Vector2dF(100.f, 100.f));
       EXPECT_TRUE(layer_tree_host()
                       ->animation_host()
                       ->scroll_offset_animations()
                       .HasUpdatesForTesting());
     } else if (layer_tree_host()->source_frame_number() == 2) {
       // Verify that the update queue is cleared after the update is applied.
       EXPECT_FALSE(layer_tree_host()
                        ->animation_host()
                        ->scroll_offset_animations()
                        .HasUpdatesForTesting());
@@ skipping 907 matching lines @@
  private:
   scoped_refptr<Layer> layer_;
   FakeContentLayerClient client_;
 };
 
 MULTI_THREAD_TEST_F(
     LayerTreeHostAnimationTestRebuildPropertyTreesOnAnimationSetNeedsCommit);
 
 }  // namespace
 }  // namespace cc