Add User Actions and adding more details to UMA metrics for overscroll navigation

content/browser/web_contents/aura/overscroll_window_animation_unittest.cc

 // Copyright 2015 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 "content/browser/web_contents/aura/overscroll_window_animation.h"
 
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
@@ skipping 109 matching lines @@
 
 // Tests a simple overscroll gesture.
 TEST_F(OverscrollWindowAnimationTest, BasicOverscroll) {
   EXPECT_FALSE(owa()->is_active());
   EXPECT_FALSE(overscroll_started());
   EXPECT_FALSE(overscroll_completing());
   EXPECT_FALSE(overscroll_completed());
   EXPECT_FALSE(overscroll_aborted());
 
   // Start an OVERSCROLL_EAST gesture.
-  owa()->OnOverscrollModeChange(OVERSCROLL_NONE, OVERSCROLL_EAST);
+  owa()->OnOverscrollModeChange(OVERSCROLL_NONE, OVERSCROLL_EAST,
+                                OverscrollSource::TOUCHPAD);
   EXPECT_TRUE(owa()->is_active());
+  EXPECT_EQ(OverscrollSource::TOUCHPAD, owa()->overscroll_source());
   EXPECT_TRUE(overscroll_started());
   EXPECT_FALSE(overscroll_completing());
   EXPECT_FALSE(overscroll_completed());
   EXPECT_FALSE(overscroll_aborted());
 
   // Complete the overscroll.
   owa()->OnOverscrollComplete(OVERSCROLL_EAST);
   EXPECT_FALSE(owa()->is_active());
   EXPECT_TRUE(overscroll_started());
   EXPECT_TRUE(overscroll_completing());
   EXPECT_TRUE(overscroll_completed());
   EXPECT_FALSE(overscroll_aborted());
 }
 
 // Tests aborting an overscroll gesture.
 TEST_F(OverscrollWindowAnimationTest, BasicAbort) {
   // Start an OVERSCROLL_EAST gesture.
-  owa()->OnOverscrollModeChange(OVERSCROLL_NONE, OVERSCROLL_EAST);
+  owa()->OnOverscrollModeChange(OVERSCROLL_NONE, OVERSCROLL_EAST,
+                                OverscrollSource::TOUCHSCREEN);
+  EXPECT_EQ(OverscrollSource::TOUCHSCREEN, owa()->overscroll_source());
   // Abort the overscroll.
-  owa()->OnOverscrollModeChange(OVERSCROLL_EAST, OVERSCROLL_NONE);
+  owa()->OnOverscrollModeChange(OVERSCROLL_EAST, OVERSCROLL_NONE,
+                                OverscrollSource::TOUCHSCREEN);
+  EXPECT_EQ(OverscrollSource::NONE, owa()->overscroll_source());
   EXPECT_FALSE(owa()->is_active());
   EXPECT_TRUE(overscroll_started());
   EXPECT_FALSE(overscroll_completing());
   EXPECT_FALSE(overscroll_completed());
   EXPECT_TRUE(overscroll_aborted());
 }
 
 // Tests starting an overscroll gesture when the slide window cannot be created.
 TEST_F(OverscrollWindowAnimationTest, BasicCannotNavigate) {
   set_create_window(false);
   // Start an OVERSCROLL_EAST gesture.
-  owa()->OnOverscrollModeChange(OVERSCROLL_NONE, OVERSCROLL_EAST);
+  owa()->OnOverscrollModeChange(OVERSCROLL_NONE, OVERSCROLL_EAST,
+                                OverscrollSource::TOUCHPAD);
   EXPECT_FALSE(owa()->is_active());
+  EXPECT_EQ(OverscrollSource::NONE, owa()->overscroll_source());
   EXPECT_TRUE(overscroll_started());
   EXPECT_FALSE(overscroll_completing());
   EXPECT_FALSE(overscroll_completed());
   EXPECT_FALSE(overscroll_aborted());
 }
 
 // Tests starting an overscroll gesture while another one was in progress
 // completes the first one.
 TEST_F(OverscrollWindowAnimationTest, NewOverscrollCompletesPreviousGesture) {
   // This test requires a normal animation duration so that
   // OnImplicitAnimationsCancelled is not called as soon as the first overscroll
   // finishes.
   ui::ScopedAnimationDurationScaleMode normal_duration(
       ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
   ui::LayerAnimator* animator = GetMainWindow()->layer()->GetAnimator();
   ui::ScopedLayerAnimationSettings settings(animator);
   animator->set_disable_timer_for_test(true);
   ui::LayerAnimatorTestController test_controller(animator);
   // Start an OVERSCROLL_EAST gesture.
-  owa()->OnOverscrollModeChange(OVERSCROLL_NONE, OVERSCROLL_EAST);
+  owa()->OnOverscrollModeChange(OVERSCROLL_NONE, OVERSCROLL_EAST,
+                                OverscrollSource::TOUCHPAD);
 
   // Finishes the OVERSCROLL_EAST gesture. At this point the window should be
   // being animated to its final position.
   owa()->OnOverscrollComplete(OVERSCROLL_EAST);
   EXPECT_TRUE(owa()->is_active());
+  EXPECT_EQ(OverscrollSource::TOUCHPAD, owa()->overscroll_source());
   EXPECT_TRUE(overscroll_started());
   EXPECT_TRUE(overscroll_completing());
   EXPECT_FALSE(overscroll_completed());
   EXPECT_FALSE(overscroll_aborted());
 
   // Start another OVERSCROLL_EAST gesture.
-  owa()->OnOverscrollModeChange(OVERSCROLL_NONE, OVERSCROLL_EAST);
+  owa()->OnOverscrollModeChange(OVERSCROLL_NONE, OVERSCROLL_EAST,
+                                OverscrollSource::TOUCHSCREEN);
   EXPECT_TRUE(owa()->is_active());
+  EXPECT_EQ(OverscrollSource::TOUCHSCREEN, owa()->overscroll_source());
   EXPECT_TRUE(overscroll_started());
   EXPECT_TRUE(overscroll_completing());
   EXPECT_TRUE(overscroll_completed());
   EXPECT_FALSE(overscroll_aborted());
 
   // Complete the overscroll gesture.
   ResetFlags();
   owa()->OnOverscrollComplete(OVERSCROLL_EAST);
 
   base::TimeDelta duration = settings.GetTransitionDuration();
   test_controller.StartThreadedAnimationsIfNeeded();
   base::TimeTicks start_time = base::TimeTicks::Now();
 
   // Halfway through the animation, OverscrollCompleting should have been fired.
   animator->Step(start_time + duration / 2);
   EXPECT_TRUE(owa()->is_active());
+  EXPECT_EQ(OverscrollSource::TOUCHSCREEN, owa()->overscroll_source());
   EXPECT_FALSE(overscroll_started());
   EXPECT_TRUE(overscroll_completing());
   EXPECT_FALSE(overscroll_completed());
   EXPECT_FALSE(overscroll_aborted());
 
   // The animation has finished, OverscrollCompleted should have been fired.
   animator->Step(start_time + duration);
   EXPECT_FALSE(owa()->is_active());
+  EXPECT_EQ(OverscrollSource::NONE, owa()->overscroll_source());
   EXPECT_FALSE(overscroll_started());
   EXPECT_TRUE(overscroll_completing());
   EXPECT_TRUE(overscroll_completed());
   EXPECT_FALSE(overscroll_aborted());
 }
 
 }  // namespace content