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

content/test/test_render_frame_host.h

Index: content/test/test_render_frame_host.h
diff --git a/content/test/test_render_frame_host.h b/content/test/test_render_frame_host.h
index 3b0c9ae13b2ad97987fdc015de6cab85c808db6b..798479fc6dd141feb64c9a0107d2532bf756e5d6 100644
--- a/content/test/test_render_frame_host.h
+++ b/content/test/test_render_frame_host.h
@@ -52,50 +52,35 @@
 
   // RenderFrameHostTester implementation.
   TestRenderFrameHost* AppendChild(const std::string& frame_name) 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 SendNavigate(int page_id, const GURL& url) override;
+  void SendFailedNavigate(int page_id, 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,
-                                                 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 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 SendNavigateWithParams(
       FrameHostMsg_DidCommitProvisionalLoad_Params* params);
-  void SendNavigateWithRedirects(int page_id,
-                                 int nav_entry_id,
-                                 bool did_create_new_entry,
-                                 const GURL& url,
-                                 const std::vector<GURL>& redirects);
+  void SendNavigateWithRedirects(
+      int page_id,
+      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,
@@ -104,9 +89,7 @@
       const std::vector<GURL>& redirects);
 
   // Simulate a renderer-initiated navigation up until commit.
-  void NavigateAndCommitRendererInitiated(int page_id,
-                                          bool did_create_new_entry,
-                                          const GURL& url);
+  void NavigateAndCommitRendererInitiated(int page_id, const GURL& url);
 
   // With the current navigation logic this method is a no-op.
   // PlzNavigate: this method simulates receiving a BeginNavigation IPC.