This CL fixes a bug in from_gws_page_load_metrics_observer.cc in WasAbortedInForeground. Earlier it…

chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc

Index: chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc
diff --git a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc
index 32285af500f6ebdf7da1cf74708dcbd8771b6db9..8659d1f0350d1956e87ee39deada21ac0e6d86ab 100644
--- a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc
+++ b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc
@@ -573,40 +573,24 @@ TEST_F(FromGWSPageLoadMetricsLoggerTest, IsGoogleSearchResultUrl) {
   }
 }
 
-TEST_F(FromGWSPageLoadMetricsLoggerTest, IsGoogleRedirectorUrl) {
+TEST_F(FromGWSPageLoadMetricsLoggerTest, IsGoogleSearchRedirectorUrl) {
   struct {
     bool expected_result;
     const char* url;
   } test_cases[] = {
-      {true, "https://www.google.com/url?"},
-      {true, "https://www.google.com/url?a=b"},
       {true, "https://www.google.com/url?source=web"},
+      {true, "https://www.google.com/url?source=web#foo"},
+      {true, "https://www.google.com/searchurl/r.html#foo"},
       {true, "https://www.google.com/url?a=b&source=web&c=d"},
-      {true, "https://www.google.co.uk/url?source=web"},
       {false, "https://www.google.com/?"},
       {false, "https://www.google.com/?url"},
       {false, "https://www.example.com/url?source=web"},
       {false, "https://google.com/url?"},
-      {false, "https://google.com/url?"},
-  };
-  for (const auto& test : test_cases) {
-    EXPECT_EQ(
-        test.expected_result,
-        FromGWSPageLoadMetricsLogger::IsGoogleRedirectorUrl(GURL(test.url)))
-        << "for URL: " << test.url;
-  }
-}
-
-TEST_F(FromGWSPageLoadMetricsLoggerTest, IsGoogleSearchRedirectorUrl) {
-  struct {
-    bool expected_result;
-    const char* url;
-  } test_cases[] = {
-      {true, "https://www.google.com/url?source=web"},
-      {true, "https://www.google.com/url?source=web#foo"},
       {false, "https://www.google.com/?source=web"},
       {false, "https://www.google.com/source=web"},
       {false, "https://www.example.com/url?source=web"},
+      {false, "https://www.google.com/url?"},
+      {false, "https://www.google.com/url?a=b"},
   };
   for (const auto& test : test_cases) {
     EXPECT_EQ(test.expected_result,
@@ -703,37 +687,69 @@ TEST_F(FromGWSPageLoadMetricsLoggerTest, NoPreviousPage) {
 
 TEST_F(FromGWSPageLoadMetricsLoggerTest, NavigationNotInitiatedViaLink) {
   FromGWSPageLoadMetricsLogger logger;
-  logger.SetPreviouslyCommittedUrl(
-      GURL("https://www.google.com/search?q=test"));
+  logger.SetPreviouslyCommittedUrl(GURL(kGoogleSearchResultsUrl));
   logger.set_navigation_initiated_via_link(false);
   ASSERT_FALSE(logger.ShouldLogMetrics(GURL(kExampleUrl)));
 }
 
-TEST_F(FromGWSPageLoadMetricsLoggerTest,
-       ProvisionalFromGWSNotInitiatedViaLink) {
+TEST_F(FromGWSPageLoadMetricsLoggerTest, ProvisionalNonHttpOrHttpsScheme) {
   FromGWSPageLoadMetricsLogger logger;
-  logger.SetProvisionalUrl(
-      GURL("https://www.google.com/search?q=test"));
-  logger.set_navigation_initiated_via_link(false);
-  ASSERT_FALSE(logger.ShouldLogMetrics(GURL(kExampleUrl)));
+  logger.SetPreviouslyCommittedUrl(GURL(kGoogleSearchResultsUrl));
+  logger.SetProvisionalUrl(GURL("intent://foo"));
+  ASSERT_FALSE(logger.ShouldLogMetrics(GURL::EmptyGURL()));
 }
 
-TEST_F(FromGWSPageLoadMetricsLoggerTest,
-       ProvisionalNotFromGWSNotInitiatedViaLink) {
+TEST_F(FromGWSPageLoadMetricsLoggerTest, ProvisionalFromGWS) {
   FromGWSPageLoadMetricsLogger logger;
-  logger.SetProvisionalUrl(GURL("https://example.test/"));
-  logger.set_navigation_initiated_via_link(false);
-  ASSERT_FALSE(logger.ShouldLogMetrics(GURL(kExampleUrl)));
+  logger.SetPreviouslyCommittedUrl(GURL(kGoogleSearchResultsUrl));
+  logger.SetProvisionalUrl(GURL(kGoogleSearchResultsUrl));
+  ASSERT_FALSE(logger.ShouldLogMetrics(GURL::EmptyGURL()));
+}
+
+TEST_F(FromGWSPageLoadMetricsLoggerTest, ProvisionalNotFromGWS) {
+  FromGWSPageLoadMetricsLogger logger;
+  logger.SetPreviouslyCommittedUrl(GURL(kGoogleSearchResultsUrl));
+  logger.SetProvisionalUrl(GURL(kExampleUrl));
+  ASSERT_TRUE(logger.ShouldLogMetrics(GURL::EmptyGURL()));
+}
+
+TEST_F(FromGWSPageLoadMetricsLoggerTest, ProvisionalIntent) {
+  FromGWSPageLoadMetricsLogger logger;
+  logger.SetPreviouslyCommittedUrl(GURL(kGoogleSearchResultsUrl));
+  logger.SetProvisionalUrl(GURL("intent://en.m.wikipedia.org/wiki/Test"));
+  ASSERT_FALSE(logger.ShouldLogMetrics(GURL::EmptyGURL()));
+}
+
+TEST_F(FromGWSPageLoadMetricsLoggerTest, ProvisionalIgnoredAfterCommit1) {
+  FromGWSPageLoadMetricsLogger logger;
+  logger.SetPreviouslyCommittedUrl(GURL(kGoogleSearchResultsUrl));
+  logger.SetProvisionalUrl(GURL(kExampleUrl));
+  logger.set_navigation_initiated_via_link(true);
+  ASSERT_FALSE(logger.ShouldLogMetrics(GURL(kGoogleSearchResultsUrl)));
+}
+
+TEST_F(FromGWSPageLoadMetricsLoggerTest, ProvisionalIgnoredAfterCommit2) {
+  FromGWSPageLoadMetricsLogger logger;
+  logger.SetPreviouslyCommittedUrl(GURL(kGoogleSearchResultsUrl));
+  logger.SetProvisionalUrl(GURL(kGoogleSearchResultsUrl));
+  logger.set_navigation_initiated_via_link(true);
+  ASSERT_TRUE(logger.ShouldLogMetrics(GURL(kExampleUrl)));
 }
 
 TEST_F(FromGWSPageLoadMetricsLoggerTest, NavigationFromSearch) {
   FromGWSPageLoadMetricsLogger logger;
-  logger.SetPreviouslyCommittedUrl(
-      GURL("https://www.google.com/search?q=test"));
+  logger.SetPreviouslyCommittedUrl(GURL(kGoogleSearchResultsUrl));
   logger.set_navigation_initiated_via_link(true);
   ASSERT_TRUE(logger.ShouldLogMetrics(GURL(kExampleUrl)));
 }
 
+TEST_F(FromGWSPageLoadMetricsLoggerTest, NavigationToSearchHostname) {
+  FromGWSPageLoadMetricsLogger logger;
+  logger.SetPreviouslyCommittedUrl(GURL(kGoogleSearchResultsUrl));
+  logger.set_navigation_initiated_via_link(true);
+  ASSERT_FALSE(logger.ShouldLogMetrics(GURL("https://www.google.com/about/")));
+}
+
 TEST_F(FromGWSPageLoadMetricsLoggerTest, NavigationFromSearchRedirector) {
   FromGWSPageLoadMetricsLogger logger;
   logger.SetPreviouslyCommittedUrl(