Classify navigations without page id in parallel to the existing classifier.

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}

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

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

1 files changed, 36 insertions, 19 deletions

diff --git a/content/test/test_render_frame_host.h b/content/test/test_render_frame_host.h
index 798479f..3b0c9ae 100644
--- a/content/test/test_render_frame_host.h
+++ b/content/test/test_render_frame_host.h
@@ -52,35 +52,50 @@ class TestRenderFrameHost : public RenderFrameHostImpl,
 
   // RenderFrameHostTester implementation.
   TestRenderFrameHost* AppendChild(const std::string& frame_name) override;
-  void SendNavigate(int page_id, const GURL& url) override;
-  void SendFailedNavigate(int page_id, const GURL& url) override;
+  void SendNavigate(int page_id,
+                    int nav_entry_id,
+                    bool did_create_new_entry,
+                    const GURL& url) override;
+  void SendFailedNavigate(int page_id,
+                          int nav_entry_id,
+                          bool did_create_new_entry,
+                          const GURL& url) override;
   void SendNavigateWithTransition(int page_id,
+                                  int nav_entry_id,
+                                  bool did_create_new_entry,
                                   const GURL& url,
                                   ui::PageTransition transition) override;
   void SetContentsMimeType(const std::string& mime_type) override;
   void SendBeforeUnloadACK(bool proceed) override;
   void SimulateSwapOutACK() override;
 
-  void SendNavigateWithTransitionAndResponseCode(
-      int page_id,
-      const GURL& url, ui::PageTransition transition,
-      int response_code);
-  void SendNavigateWithOriginalRequestURL(
-      int page_id,
-      const GURL& url,
-      const GURL& original_request_url);
-  void SendNavigateWithFile(
-      int page_id,
-      const GURL& url,
-      const base::FilePath& file_path);
+  void SendNavigateWithTransitionAndResponseCode(int page_id,
+                                                 int nav_entry_id,
+                                                 bool did_create_new_entry,
+                                                 const GURL& url,
+                                                 ui::PageTransition transition,
+                                                 int response_code);
+  void SendNavigateWithOriginalRequestURL(int page_id,
+                                          int nav_entry_id,
+                                          bool did_create_new_entry,
+                                          const GURL& url,
+                                          const GURL& original_request_url);
+  void SendNavigateWithFile(int page_id,
+                            int nav_entry_id,
+                            bool did_create_new_entry,
+                            const GURL& url,
+                            const base::FilePath& file_path);
   void SendNavigateWithParams(
       FrameHostMsg_DidCommitProvisionalLoad_Params* params);
-  void SendNavigateWithRedirects(
-      int page_id,
-      const GURL& url,
-      const std::vector<GURL>& redirects);
+  void SendNavigateWithRedirects(int page_id,
+                                 int nav_entry_id,
+                                 bool did_create_new_entry,
+                                 const GURL& url,
+                                 const std::vector<GURL>& redirects);
   void SendNavigateWithParameters(
       int page_id,
+      int nav_entry_id,
+      bool did_create_new_entry,
       const GURL& url,
       ui::PageTransition transition,
       const GURL& original_request_url,
@@ -89,7 +104,9 @@ class TestRenderFrameHost : public RenderFrameHostImpl,
       const std::vector<GURL>& redirects);
 
   // Simulate a renderer-initiated navigation up until commit.
-  void NavigateAndCommitRendererInitiated(int page_id, const GURL& url);
+  void NavigateAndCommitRendererInitiated(int page_id,
+                                          bool did_create_new_entry,
+                                          const GURL& url);
 
   // With the current navigation logic this method is a no-op.
   // PlzNavigate: this method simulates receiving a BeginNavigation IPC.