Move back 'PageLoad' user action to stability metrics.

'PageLoad' user action was moved from stability_metrics.cc to
'navigation_metrics.cc' in Ib1d19c1ec82916da495c8cff5885152abb55822f.
This had resulted in not counting unsuccessful page loads, sub frames,
and ChromeOS pre sign-in page loads.
The change is reverted.

Bug: 912346, 971023
Change-Id: Ic18b6b5c4cfc7b5bf0fd75ed132ca97b83c08c3e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1642628
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Christopher Thompson <cthomp@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666169}

components/metrics/stability_metrics_helper.cc

@@ -225,6 +225,7 @@ void StabilityMetricsHelper::BrowserChildProcessCrashed() {
 }
 
 void StabilityMetricsHelper::LogLoadStarted() {
+  base::RecordAction(base::UserMetricsAction("PageLoad"));
   IncrementPrefValue(prefs::kStabilityPageLoadCount);
   IncrementLongPrefsValue(prefs::kUninstallMetricsPageLoadCount);
   // We need to save the prefs, as page load count is a critical stat, and it

components/navigation_metrics/navigation_metrics.cc

@@ -79,7 +79,6 @@ void RecordMainFrameNavigation(const GURL& url,
 
     base::RecordAction(base::UserMetricsAction("PageLoadInIncognito"));
   }
-  base::RecordAction(base::UserMetricsAction("PageLoad"));
 }
 
 void RecordOmniboxURLNavigation(const GURL& url) {

components/navigation_metrics/navigation_metrics_unittest.cc

@@ -19,7 +19,6 @@ const char* const kMainFrameSchemeDifferentPage =
 const char* const kMainFrameSchemeOTR = "Navigation.MainFrameSchemeOTR";
 const char* const kMainFrameSchemeDifferentPageOTR =
     "Navigation.MainFrameSchemeDifferentPageOTR";
-const char* const kPageLoad = "PageLoad";
 const char* const kPageLoadInIncognito = "PageLoadInIncognito";
 constexpr char kMainFrameHasRTLDomain[] = "Navigation.MainFrameHasRTLDomain";
 constexpr char kMainFrameHasRTLDomainDifferentPage[] =
@@ -30,7 +29,6 @@ namespace navigation_metrics {
 
 TEST(NavigationMetrics, MainFrameSchemeDifferentDocument) {
   base::HistogramTester test;
-  base::UserActionTester user_action_tester;
 
   RecordMainFrameNavigation(GURL(kTestUrl), false, false);
 
@@ -40,12 +38,10 @@ TEST(NavigationMetrics, MainFrameSchemeDifferentDocument) {
   test.ExpectUniqueSample(kMainFrameSchemeDifferentPage, 1 /* http */, 1);
   test.ExpectTotalCount(kMainFrameSchemeOTR, 0);
   test.ExpectTotalCount(kMainFrameSchemeDifferentPageOTR, 0);
-  EXPECT_EQ(1, user_action_tester.GetActionCount(kPageLoad));
 }
 
 TEST(NavigationMetrics, MainFrameSchemeSameDocument) {
   base::HistogramTester test;
-  base::UserActionTester user_action_tester;
 
   RecordMainFrameNavigation(GURL(kTestUrl), true, false);
 
@@ -54,7 +50,6 @@ TEST(NavigationMetrics, MainFrameSchemeSameDocument) {
   test.ExpectTotalCount(kMainFrameSchemeDifferentPage, 0);
   test.ExpectTotalCount(kMainFrameSchemeOTR, 0);
   test.ExpectTotalCount(kMainFrameSchemeDifferentPageOTR, 0);
-  EXPECT_EQ(1, user_action_tester.GetActionCount(kPageLoad));
 }
 
 TEST(NavigationMetrics, MainFrameSchemeDifferentDocumentOTR) {

tools/metrics/actions/actions.xml

@@ -15782,7 +15782,10 @@ should be able to be added at any place in this file.
 
 <action name="PageLoad" not_user_triggered="true">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
-  <description>Please enter the description of this user action.</description>
+  <description>
+    When a page load starts. This can include page loads that are not completed,
+    sub frames, and pre sign-in ChromeOS pages.
+  </description>
 </action>
 
 <action name="PageLoadInIncognito" not_user_triggered="true">