Classify navigations without page id in parallel to the existing clas…

…sifier.

For now, this only happens in debug builds.

BUG=369661
TEST=NavigationControllerBrowserTest.NavigationTypeClassification_*
TEST=Every other test on the planet.

Committed: https://crrev.com/d8d93348bbd8c646c337bdaa40fc0c64204fc5ff
Cr-Commit-Position: refs/heads/master@{#327122}

Reverted: https://crrev.com/5348e920f4119aff9a4eb76c0965725dc85a66cc
Cr-Revert-Position: refs/heads/master@{#327152}

Committed: https://crrev.com/5671403d44971669e4d81aecf3f002188ce0e95f
Cr-Commit-Position: refs/heads/master@{#327214}

Reverted: https://crrev.com/49180eb13549e440bbd4f66390e32e84699dcdfd
Cr-Revert-Position: refs/heads/master@{#327269}

Committed: https://crrev.com/a038c6670f450313a8e224ccc5d05dd59e3488c4
Cr-Commit-Position: refs/heads/master@{#328131}

Reverted: https://crrev.com/1f5d6196b8d53e70e7a7a2276cdf3481365e7e04
Cr-Revert-Position: refs/heads/master@{#328282}

Committed: https://crrev.com/61cae85448cfeb793270e804b5ad1023993279c5
Cr-Commit-Position: refs/heads/master@{#328829}

Reverted: https://crrev.com/c0b9c8f3333acddb945165bce44f5605dcf56f0f
Cr-Revert-Position: refs/heads/master@{#328924}

Review URL: https://codereview.chromium.org/1002803002

Cr-Commit-Position: refs/heads/master@{#328979}

chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc

@@ -13,6 +13,7 @@
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/web_contents_tester.h"
 
@@ -64,10 +65,14 @@ class MergeSessionLoadPageTest : public ChromeRenderViewHostTestHarness {
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
-  void Navigate(const char* url, int page_id) {
-    WebContentsTester::For(web_contents())->TestDidNavigate(
-        web_contents()->GetMainFrame(), page_id, GURL(url),
-        ui::PAGE_TRANSITION_TYPED);
+  void Navigate(const char* url,
+                int page_id,
+                int nav_entry_id,
+                bool did_create_new_entry) {
+    WebContentsTester::For(web_contents())
+        ->TestDidNavigate(web_contents()->GetMainFrame(), page_id, nav_entry_id,
+                          did_create_new_entry, GURL(url),
+                          ui::PAGE_TRANSITION_TYPED);
   }
 
   void ShowInterstitial(const char* url) {
@@ -117,7 +122,7 @@ class MergeSessionLoadPageTest : public ChromeRenderViewHostTestHarness {
 TEST_F(MergeSessionLoadPageTest, MergeSessionPageNotShown) {
   SetMergeSessionState(OAuth2LoginManager::SESSION_RESTORE_DONE);
   // Start a load.
-  Navigate(kURL1, 1);
+  Navigate(kURL1, 1, 0, true);
   // Load next page.
   controller().LoadURL(GURL(kURL2), content::Referrer(),
                        ui::PAGE_TRANSITION_TYPED, std::string());
@@ -135,7 +140,7 @@ TEST_F(MergeSessionLoadPageTest, MergeSessionPageNotShownOnTimeout) {
       base::TimeDelta::FromSeconds(kSessionMergeTimeout + 1));
 
   // Start a load.
-  Navigate(kURL1, 1);
+  Navigate(kURL1, 1, 0, true);
   // Load next page.
   controller().LoadURL(GURL(kURL2), content::Referrer(),
                        ui::PAGE_TRANSITION_TYPED, std::string());
@@ -150,10 +155,11 @@ TEST_F(MergeSessionLoadPageTest, MergeSessionPageShown) {
   SetMergeSessionState(OAuth2LoginManager::SESSION_RESTORE_IN_PROGRESS);
 
   // Start a load.
-  Navigate(kURL1, 1);
+  Navigate(kURL1, 1, 0, true);
   // Load next page.
   controller().LoadURL(GURL(kURL2), content::Referrer(),
                        ui::PAGE_TRANSITION_TYPED, std::string());
+  int pending_id = controller().GetPendingEntry()->GetUniqueID();
 
   // Simulate the load causing an merge session interstitial page
   // to be shown.
@@ -170,7 +176,7 @@ TEST_F(MergeSessionLoadPageTest, MergeSessionPageShown) {
   EXPECT_EQ(kURL2, web_contents()->GetVisibleURL().spec());
 
   // Commit navigation and the interstitial page is gone.
-  Navigate(kURL2, 2);
+  Navigate(kURL2, 2, pending_id, true);
   EXPECT_FALSE(GetMergeSessionLoadPage());
 }
 

chrome/browser/chromeos/offline/offline_load_page_unittest.cc

@@ -61,10 +61,14 @@ class OfflineLoadPageTest : public ChromeRenderViewHostTestHarness {
       user_response_ = CANCEL;
   }
 
-  void Navigate(const char* url, int page_id) {
-    WebContentsTester::For(web_contents())->TestDidNavigate(
-        web_contents()->GetMainFrame(), page_id, GURL(url),
-        ui::PAGE_TRANSITION_TYPED);
+  void Navigate(const char* url,
+                int page_id,
+                int nav_entry_id,
+                bool did_create_new_entry) {
+    WebContentsTester::For(web_contents())
+        ->TestDidNavigate(web_contents()->GetMainFrame(), page_id, nav_entry_id,
+                          did_create_new_entry, GURL(url),
+                          ui::PAGE_TRANSITION_TYPED);
   }
 
   void ShowInterstitial(const char* url) {
@@ -91,7 +95,7 @@ void TestOfflineLoadPage::NotifyBlockingPageComplete(bool proceed) {
 
 TEST_F(OfflineLoadPageTest, OfflinePageProceed) {
   // Start a load.
-  Navigate(kURL1, 1);
+  Navigate(kURL1, 1, 0, true);
   // Load next page.
   controller().LoadURL(GURL(kURL2), content::Referrer(),
                        ui::PAGE_TRANSITION_TYPED, std::string());
@@ -113,14 +117,14 @@ TEST_F(OfflineLoadPageTest, OfflinePageProceed) {
   EXPECT_EQ(kURL2, web_contents()->GetVisibleURL().spec());
 
   // Commit navigation and the interstitial page is gone.
-  Navigate(kURL2, 2);
+  Navigate(kURL2, 2, 0, true);
   EXPECT_FALSE(GetOfflineLoadPage());
 }
 
 // Tests showing an offline page and not proceeding.
 TEST_F(OfflineLoadPageTest, OfflinePageDontProceed) {
   // Start a load.
-  Navigate(kURL1, 1);
+  Navigate(kURL1, 1, 0, true);
   controller().LoadURL(GURL(kURL2), content::Referrer(),
                        ui::PAGE_TRANSITION_TYPED, std::string());
 

chrome/browser/geolocation/geolocation_permission_context_unittest.cc

@@ -32,6 +32,7 @@
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
@@ -224,8 +225,9 @@ void GeolocationPermissionContextTests::AddNewTab(const GURL& url) {
   content::WebContents* new_tab = CreateTestWebContents();
   new_tab->GetController().LoadURL(
       url, content::Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
+  content::NavigationEntry* entry = new_tab->GetController().GetPendingEntry();
   content::RenderFrameHostTester::For(new_tab->GetMainFrame())
-      ->SendNavigate(extra_tabs_.size() + 1, url);
+      ->SendNavigate(extra_tabs_.size() + 1, entry->GetUniqueID(), true, url);
 
   // Set up required helpers, and make this be as "tabby" as the code requires.
 #if defined(ENABLE_EXTENSIONS)

chrome/browser/rlz/rlz_unittest.cc

@@ -272,9 +272,11 @@ void RlzLibTest::SimulateHomepageUsage() {
       content::RenderFrameHostTester::For(main_rfh());
 
   // Simulate a navigation to homepage first.
-  rfht->SendNavigateWithTransition(0, home_url, ui::PAGE_TRANSITION_HOME_PAGE);
+  rfht->SendNavigateWithTransition(
+      0, 0, true, home_url, ui::PAGE_TRANSITION_HOME_PAGE);
   // Then simulate a search from homepage.
-  rfht->SendNavigateWithTransition(1, search_url, ui::PAGE_TRANSITION_LINK);
+  rfht->SendNavigateWithTransition(
+      1, 0, true, search_url, ui::PAGE_TRANSITION_LINK);
 }
 
 void RlzLibTest::SimulateAppListUsage() {

chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc

@@ -25,6 +25,7 @@
 #include "components/history/core/browser/history_backend.h"
 #include "components/history/core/browser/history_service.h"
 #include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer.h"
 #include "content/public/test/test_browser_thread.h"
@@ -132,6 +133,8 @@ class BrowserFeatureExtractorTest : public ChromeRenderViewHostTestHarness {
     web_contents()->GetController().LoadURL(
         url, content::Referrer(referrer, blink::WebReferrerPolicyDefault),
         type, std::string());
+    int pending_id =
+        web_contents()->GetController().GetPendingEntry()->GetUniqueID();
 
     static int page_id = 0;
     content::RenderFrameHost* rfh =
@@ -141,7 +144,7 @@ class BrowserFeatureExtractorTest : public ChromeRenderViewHostTestHarness {
     }
     WebContentsTester::For(web_contents())->ProceedWithCrossSiteNavigation();
     WebContentsTester::For(web_contents())->TestDidNavigateWithReferrer(
-        rfh, ++page_id, url,
+        rfh, ++page_id, pending_id, true, url,
         content::Referrer(referrer, blink::WebReferrerPolicyDefault), type);
   }