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

cc/trees/layer_tree_host_impl_unittest.cc

 // Copyright 2011 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_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 9718 matching lines @@
   // aborted.
   EXPECT_FALSE(host_impl_->animation_host()->HasActiveAnimationForTesting(
       scrolling_layer->id()));
 
   EXPECT_VECTOR2DF_EQ(gfx::ScrollOffset(0, y + 50),
                       scrolling_layer->CurrentScrollOffset());
   EXPECT_EQ(NULL, host_impl_->CurrentlyScrollingLayer());
   host_impl_->DidFinishImplFrame();
 }
 
-// Test that a smooth scroll offset animation is marked finished when a main
-// thread scrolling reason is added. The animation is then finished on the
+// Test that a smooth scroll offset animation is marked finished when aborted
+// with the needs_completion flag. The animation is then finished on the
 // main thread.
 TEST_F(LayerTreeHostImplTimelinesTest,
        ScrollAnimatedFinishedByMainThreadScrollingReason) {
   const gfx::Size content_size(1000, 1000);
   const gfx::Size viewport_size(500, 500);
   CreateBasicVirtualViewportLayers(viewport_size, content_size);
 
   DrawFrame();
 
   base::TimeTicks start_time =
@@ skipping 22 matching lines @@
 
   begin_frame_args.frame_time =
       start_time + base::TimeDelta::FromMilliseconds(50);
   host_impl_->WillBeginImplFrame(begin_frame_args);
   host_impl_->Animate();
   host_impl_->UpdateAnimationState(true);
 
   float y = scrolling_layer->CurrentScrollOffset().y();
   EXPECT_TRUE(y > 1 && y < 49);
 
-  // Add main thread scrolling reason.
-  scrolling_layer->set_main_thread_scrolling_reasons(
-      MainThreadScrollingReason::kHasNonLayerViewportConstrainedObjects);
+  // Abort animation.
+  host_impl_->animation_host()->ScrollAnimationAbort(true /*needs_completion*/);
   host_impl_->UpdateAnimationState(true);
 
-  // The main thread scrolling reason should have marked the smooth scroll
-  // animation as finished.
+  // Aborting with the needs completion param should have marked the smooth
+  // scroll animation as finished.
   EXPECT_FALSE(host_impl_->animation_host()->HasActiveAnimationForTesting(
       scrolling_layer->id()));
   EXPECT_TRUE(y > 1 && y < 49);
   EXPECT_EQ(NULL, host_impl_->CurrentlyScrollingLayer());
   host_impl_->DidFinishImplFrame();
 }
 
 // Evolved from LayerTreeHostImplTest.ScrollAnimated.
 TEST_F(LayerTreeHostImplTimelinesTest, ScrollAnimated) {
   const gfx::Size content_size(1000, 1000);
@@ skipping 950 matching lines @@
 
   // Re-initialize with a software output surface.
   output_surface_ = FakeOutputSurface::CreateSoftware(
       base::WrapUnique(new SoftwareOutputDevice));
   host_impl_->InitializeRenderer(output_surface_.get());
   EXPECT_FALSE(host_impl_->use_gpu_rasterization());
 }
 
 }  // namespace
 }  // namespace cc