Generalize the reload PLMO to support other transition types.

chrome/browser/page_load_metrics/observers/aborts_page_load_metrics_observer_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 "chrome/browser/page_load_metrics/observers/aborts_page_load_metrics_observer.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h"
 
 class AbortsPageLoadMetricsObserverTest
@@ skipping 18 matching lines @@
       internal::kHistogramAbortUnknownNavigationBeforeCommit, 1);
 }
 
 TEST_F(AbortsPageLoadMetricsObserverTest, NewNavigationBeforePaint) {
   NavigateAndCommit(GURL("https://www.google.com"));
   SimulateTimingWithoutPaint();
   // Simulate the user performing another navigation before paint.
   NavigateAndCommit(GURL("https://www.example.com"));
   histogram_tester().ExpectTotalCount(
       internal::kHistogramAbortNewNavigationBeforePaint, 1);
+  histogram_tester().ExpectTotalCount(
+      internal::kHistogramAbortReloadBeforePaint, 0);
+  histogram_tester().ExpectTotalCount(
+      internal::kHistogramAbortForwardBackBeforePaint, 0);
+}
+
+TEST_F(AbortsPageLoadMetricsObserverTest, ReloadBeforePaint) {
+  NavigateAndCommit(GURL("https://www.example.com"));
+  SimulateTimingWithoutPaint();
+  // Simulate the user performing a reload navigation before paint.
+  NavigateWithPageTransitionAndCommit(GURL("https://www.google.com"),
+                                      ui::PAGE_TRANSITION_RELOAD);
+  histogram_tester().ExpectTotalCount(
+      internal::kHistogramAbortReloadBeforePaint, 1);
+  histogram_tester().ExpectTotalCount(
+      internal::kHistogramAbortNewNavigationBeforePaint, 0);
+  histogram_tester().ExpectTotalCount(
+      internal::kHistogramAbortForwardBackBeforePaint, 0);
+}
+
+TEST_F(AbortsPageLoadMetricsObserverTest, ForwardBackBeforePaint) {
+  NavigateAndCommit(GURL("https://www.example.com"));
+  SimulateTimingWithoutPaint();
+  // Simulate the user performing a forward/back navigation before paint.
+  NavigateWithPageTransitionAndCommit(
+      GURL("https://www.google.com"),
+      ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
+                                ui::PAGE_TRANSITION_FORWARD_BACK));
+  histogram_tester().ExpectTotalCount(
+      internal::kHistogramAbortForwardBackBeforePaint, 1);
+  histogram_tester().ExpectTotalCount(
+      internal::kHistogramAbortNewNavigationBeforePaint, 0);
+  histogram_tester().ExpectTotalCount(
+      internal::kHistogramAbortReloadBeforePaint, 0);
 }
 
 TEST_F(AbortsPageLoadMetricsObserverTest, StopBeforeCommit) {
   StartNavigation(GURL("https://www.google.com"));
   // Simulate the user pressing the stop button.
   web_contents()->Stop();
   // Now close the tab. This will trigger logging for the prior navigation which
   // was stopped above.
   DeleteContents();
   histogram_tester().ExpectTotalCount(internal::kHistogramAbortStopBeforeCommit,
@@ skipping 69 matching lines @@
   NavigateAndCommit(GURL("https://www.example.com"));
   SimulateTimingWithoutPaint();
   // Simulate closing the tab.
   DeleteContents();
   histogram_tester().ExpectTotalCount(internal::kHistogramAbortStopBeforeCommit,
                                       1);
   histogram_tester().ExpectTotalCount(internal::kHistogramAbortCloseBeforePaint,
                                       1);
 }
 
-// TODO(bmcquade): add tests for reload, back/forward, and other aborts.
-
 TEST_F(AbortsPageLoadMetricsObserverTest, NoAbortNewNavigationFromAboutURL) {
   NavigateAndCommit(GURL("about:blank"));
   NavigateAndCommit(GURL("https://www.example.com"));
   histogram_tester().ExpectTotalCount(
       internal::kHistogramAbortNewNavigationBeforePaint, 0);
 }
 
 TEST_F(AbortsPageLoadMetricsObserverTest,
        NoAbortNewNavigationFromURLWithoutTiming) {
   NavigateAndCommit(GURL("https://www.google.com"));
@@ skipping 20 matching lines @@
 
   NavigateAndCommit(GURL("https://www.example.com"));
 
   base::HistogramTester::CountsMap counts_map =
       histogram_tester().GetTotalCountsForPrefix(
           internal::kHistogramAbortNewNavigationBeforePaint);
 
   EXPECT_TRUE(counts_map.empty() ||
               (counts_map.size() == 1 && counts_map.begin()->second == 1));
 }