Adding metrics logging for Simplified Gesture Navigation.

content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc

 // Copyright 2014 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_navigation_overlay.h"
 
 #include <string.h>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/user_action_tester.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
-#include "content/browser/web_contents/aura/uma_navigation_type.h"
+#include "content/browser/web_contents/aura/types.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/common/frame_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/overscroll_configuration.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/test/test_render_frame_host.h"
 #include "content/test/test_render_view_host.h"
 #include "content/test/test_web_contents.h"
 #include "ui/aura/test/test_windows.h"
@@ skipping 124 matching lines @@
     GetOverlay()->owa_->SetOverscrollSourceForTesting(source);
     std::unique_ptr<aura::Window> window(
         GetOverlay()->CreateBackWindow(GetBackSlideWindowBounds()));
     bool window_created = !!window;
     if (window_created) {
       histogram_tester()->ExpectTotalCount(kUmaStarted, 1);
       histogram_tester()->ExpectBucketCount(
           kUmaStarted, source == OverscrollSource::TOUCHPAD ? BACK_TOUCHPAD
                                                             : BACK_TOUCHSCREEN,
           1);
-      EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::BACK);
+      EXPECT_EQ(GetOverlay()->direction_, NavigationDirection::BACK);
       // Performs BACK navigation, sets image from layer_delegate_ on
       // image_delegate_.
       GetOverlay()->OnOverscrollCompleting();
       window->SetBounds(gfx::Rect(root_window()->bounds().size()));
 
       histogram_tester()->ExpectTotalCount(kUmaNavigated, 0);
       EXPECT_EQ(0, action_tester()->GetActionCount(kActionNavigatedBack));
 
       GetOverlay()->OnOverscrollCompleted(std::move(window));
       histogram_tester()->ExpectTotalCount(kUmaNavigated, 1);
       histogram_tester()->ExpectBucketCount(kUmaNavigated,
                                             source == OverscrollSource::TOUCHPAD
                                                 ? BACK_TOUCHPAD
                                                 : BACK_TOUCHSCREEN,
                                             1);
       EXPECT_EQ(1, action_tester()->GetActionCount(kActionNavigatedBack));
     } else {
-      EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::NONE);
+      EXPECT_EQ(GetOverlay()->direction_, NavigationDirection::NONE);
       histogram_tester()->ExpectTotalCount(kUmaStarted, 0);
     }
     GetOverlay()->owa_->SetOverscrollSourceForTesting(OverscrollSource::NONE);
     if (IsBrowserSideNavigationEnabled())
       main_test_rfh()->PrepareForCommit();
     else
       contents()->GetPendingMainFrame()->PrepareForCommit();
     if (window_created)
       EXPECT_TRUE(contents()->CrossProcessNavigationPending());
     else
@@ skipping 124 matching lines @@
             nullptr);
 }
 
 // Tests that if a navigation is cancelled, no navigation is performed and the
 // state is restored.
 TEST_F(OverscrollNavigationOverlayTest, CancelNavigation) {
   GetOverlay()->owa_->SetOverscrollSourceForTesting(
       OverscrollSource::TOUCHSCREEN);
   std::unique_ptr<aura::Window> window =
       GetOverlay()->CreateBackWindow(GetBackSlideWindowBounds());
-  EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::BACK);
+  EXPECT_EQ(GetOverlay()->direction_, NavigationDirection::BACK);
 
   histogram_tester()->ExpectTotalCount(kUmaCancelled, 0);
   EXPECT_EQ(0, action_tester()->GetActionCount(kActionCancelledBack));
 
   GetOverlay()->OnOverscrollCancelled();
   EXPECT_FALSE(contents()->CrossProcessNavigationPending());
-  EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::NONE);
+  EXPECT_EQ(GetOverlay()->direction_, NavigationDirection::NONE);
   histogram_tester()->ExpectTotalCount(kUmaCancelled, 1);
   histogram_tester()->ExpectBucketCount(kUmaCancelled, BACK_TOUCHSCREEN, 1);
   EXPECT_EQ(1, action_tester()->GetActionCount(kActionCancelledBack));
 }
 
 TEST_F(OverscrollNavigationOverlayTest, ForwardNavigation) {
   PerformBackNavigationViaSliderCallbacks(OverscrollSource::TOUCHPAD);
 
   GetOverlay()->owa_->SetOverscrollSourceForTesting(OverscrollSource::TOUCHPAD);
   std::unique_ptr<aura::Window> window =
       GetOverlay()->CreateFrontWindow(GetBackSlideWindowBounds());
-  EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::FORWARD);
+  EXPECT_EQ(GetOverlay()->direction_, NavigationDirection::FORWARD);
   histogram_tester()->ExpectTotalCount(kUmaStarted, 2);
   histogram_tester()->ExpectBucketCount(kUmaStarted, FORWARD_TOUCHPAD, 1);
 
   GetOverlay()->OnOverscrollCompleting();
   histogram_tester()->ExpectTotalCount(kUmaNavigated, 1);
   EXPECT_EQ(0, action_tester()->GetActionCount(kActionNavigatedForward));
 
   GetOverlay()->OnOverscrollCompleted(std::move(window));
   histogram_tester()->ExpectTotalCount(kUmaNavigated, 2);
   histogram_tester()->ExpectBucketCount(kUmaNavigated, FORWARD_TOUCHPAD, 1);
   EXPECT_EQ(1, action_tester()->GetActionCount(kActionNavigatedForward));
 
   EXPECT_TRUE(contents()->CrossProcessNavigationPending());
 }
 
 TEST_F(OverscrollNavigationOverlayTest, ForwardNavigationCancelled) {
   PerformBackNavigationViaSliderCallbacks(OverscrollSource::TOUCHPAD);
 
   GetOverlay()->owa_->SetOverscrollSourceForTesting(
       OverscrollSource::TOUCHSCREEN);
   std::unique_ptr<aura::Window> window =
       GetOverlay()->CreateFrontWindow(GetBackSlideWindowBounds());
-  EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::FORWARD);
+  EXPECT_EQ(GetOverlay()->direction_, NavigationDirection::FORWARD);
   histogram_tester()->ExpectTotalCount(kUmaStarted, 2);
   histogram_tester()->ExpectBucketCount(kUmaStarted, FORWARD_TOUCHSCREEN, 1);
 
   histogram_tester()->ExpectTotalCount(kUmaCancelled, 0);
   EXPECT_EQ(0, action_tester()->GetActionCount(kActionCancelledForward));
 
   GetOverlay()->OnOverscrollCancelled();
-  EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::NONE);
+  EXPECT_EQ(GetOverlay()->direction_, NavigationDirection::NONE);
   histogram_tester()->ExpectTotalCount(kUmaCancelled, 1);
   histogram_tester()->ExpectBucketCount(kUmaCancelled, FORWARD_TOUCHSCREEN, 1);
   EXPECT_EQ(1, action_tester()->GetActionCount(kActionCancelledForward));
 }
 
 // Performs two navigations. The second navigation is cancelled, tests that the
 // first one worked correctly.
 TEST_F(OverscrollNavigationOverlayTest, CancelAfterSuccessfulNavigation) {
   PerformBackNavigationViaSliderCallbacks(OverscrollSource::TOUCHPAD);
   GetOverlay()->owa_->SetOverscrollSourceForTesting(OverscrollSource::TOUCHPAD);
   std::unique_ptr<aura::Window> wrapper =
       GetOverlay()->CreateBackWindow(GetBackSlideWindowBounds());
-  EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::BACK);
+  EXPECT_EQ(GetOverlay()->direction_, NavigationDirection::BACK);
   histogram_tester()->ExpectTotalCount(kUmaStarted, 2);
   histogram_tester()->ExpectBucketCount(kUmaStarted, BACK_TOUCHPAD, 2);
 
   GetOverlay()->OnOverscrollCancelled();
-  EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::NONE);
+  EXPECT_EQ(GetOverlay()->direction_, NavigationDirection::NONE);
   histogram_tester()->ExpectTotalCount(kUmaCancelled, 1);
   histogram_tester()->ExpectBucketCount(kUmaCancelled, BACK_TOUCHPAD, 1);
   EXPECT_EQ(1, action_tester()->GetActionCount(kActionCancelledBack));
   // Navigation metrics shouldn't change.
   histogram_tester()->ExpectTotalCount(kUmaNavigated, 1);
   EXPECT_EQ(1, action_tester()->GetActionCount(kActionNavigatedBack));
 
   EXPECT_TRUE(contents()->CrossProcessNavigationPending());
   NavigationEntry* pending = contents()->GetController().GetPendingEntry();
   contents()->GetPendingMainFrame()->SendNavigateWithTransition(
@@ skipping 41 matching lines @@
       pending->GetUniqueID(), false, pending->GetURL());
   EXPECT_EQ(contents()->GetURL(), third());
 }
 
 TEST_F(OverscrollNavigationOverlayTest, CloseDuringAnimation) {
   ui::ScopedAnimationDurationScaleMode normal_duration_(
       ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
   GetOverlay()->owa_->OnOverscrollModeChange(OVERSCROLL_NONE, OVERSCROLL_EAST,
                                              OverscrollSource::TOUCHSCREEN);
   GetOverlay()->owa_->OnOverscrollComplete(OVERSCROLL_EAST);
-  EXPECT_EQ(GetOverlay()->direction_, OverscrollNavigationOverlay::BACK);
+  EXPECT_EQ(GetOverlay()->direction_, NavigationDirection::BACK);
   OverscrollTestWebContents* test_web_contents =
       static_cast<OverscrollTestWebContents*>(web_contents());
   test_web_contents->set_is_being_destroyed(true);
   test_web_contents->ResetContentNativeView();
   test_web_contents->ResetNativeView();
   // Ensure a clean close.
 }
 
 // Tests that we can handle the case when the load completes as soon as the
 // navigation is started.
@@ skipping 86 matching lines @@
   EXPECT_TRUE(GetOverlay()->window_.get());
 
   // Load the page.
   contents()->CommitPendingNavigation();
   ReceivePaintUpdate();
   EXPECT_FALSE(GetOverlay()->window_.get());
   EXPECT_EQ(contents()->GetURL(), first());
 }
 
 }  // namespace content