[ Don't commit ] Add FromGWS variants to the AbortTiming metrics

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 263b8a8f78b0db3a4badb011fe876a52a8db84f6..2a9d90603933fb9dce265fa90733f5e5ffdc80f7 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
@@ -522,45 +522,51 @@ TEST_F(FromGWSPageLoadMetricsLoggerTest, QueryContainsComponentPrefix) {
 
 TEST_F(FromGWSPageLoadMetricsLoggerTest, Basic) {
   FromGWSPageLoadMetricsLogger logger;
-  ASSERT_FALSE(logger.ShouldLogMetrics(GURL(kExampleUrl)));
+  ASSERT_EQ(internal::NavigationNotFromGWS,
+            logger.GetNavigationFromGWSType(GURL(kExampleUrl)));
 }
 
 TEST_F(FromGWSPageLoadMetricsLoggerTest, NoPreviousPage) {
   FromGWSPageLoadMetricsLogger logger;
-  logger.set_previously_committed_url(GURL());
+  logger.SetPreviouslyCommittedUrl(GURL());
   logger.set_navigation_initiated_via_link(true);
-  ASSERT_FALSE(logger.ShouldLogMetrics(GURL(kExampleUrl)));
+  ASSERT_EQ(internal::NavigationNotFromGWS,
+            logger.GetNavigationFromGWSType(GURL(kExampleUrl)));
 }
 
 TEST_F(FromGWSPageLoadMetricsLoggerTest, NavigationNotInitiatedViaLink) {
   FromGWSPageLoadMetricsLogger logger;
-  logger.set_previously_committed_url(
+  logger.SetPreviouslyCommittedUrl(
       GURL("https://www.google.com/search?q=test"));
   logger.set_navigation_initiated_via_link(false);
-  ASSERT_FALSE(logger.ShouldLogMetrics(GURL(kExampleUrl)));
+  ASSERT_EQ(internal::NavigationNotFromGWS,
+            logger.GetNavigationFromGWSType(GURL(kExampleUrl)));
 }
 
 TEST_F(FromGWSPageLoadMetricsLoggerTest, NavigationFromSearchToSearch) {
   FromGWSPageLoadMetricsLogger logger;
-  logger.set_previously_committed_url(
+  logger.SetPreviouslyCommittedUrl(
       GURL("https://www.google.com/search?q=test"));
   logger.set_navigation_initiated_via_link(true);
-  ASSERT_FALSE(
-      logger.ShouldLogMetrics(GURL("https://www.google.com/search?q=test")));
+  ASSERT_EQ(internal::NavigationNotFromGWS,
+            logger.GetNavigationFromGWSType(
+                GURL("https://www.google.com/search?q=test")));
 }
 
 TEST_F(FromGWSPageLoadMetricsLoggerTest, NavigationFromSearch) {
   FromGWSPageLoadMetricsLogger logger;
-  logger.set_previously_committed_url(
+  logger.SetPreviouslyCommittedUrl(
       GURL("https://www.google.com/search?q=test"));
   logger.set_navigation_initiated_via_link(true);
-  ASSERT_TRUE(logger.ShouldLogMetrics(GURL(kExampleUrl)));
+  ASSERT_EQ(internal::CommittedNavigationFromGWSPreviousCommit,
+            logger.GetNavigationFromGWSType(GURL(kExampleUrl)));
 }
 
 TEST_F(FromGWSPageLoadMetricsLoggerTest, NavigationFromSearchRedirector) {
   FromGWSPageLoadMetricsLogger logger;
-  logger.set_previously_committed_url(
+  logger.SetPreviouslyCommittedUrl(
       GURL("https://www.google.com/url?source=web"));
   logger.set_navigation_initiated_via_link(true);
-  ASSERT_TRUE(logger.ShouldLogMetrics(GURL(kExampleUrl)));
+  ASSERT_EQ(internal::CommittedNavigationFromGWSPreviousCommit,
+            logger.GetNavigationFromGWSType(GURL(kExampleUrl)));
 }