Revert of Classify navigations without page id in parallel to the existing classifier. (patchset #35 id:680001 of https://codereview.chromium.org/1002803002/)

Reason for revert:
Very flaky on ChromeOS debug bots. See crbug.com/481910

Original issue's description:
> 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}
>
> Committed: https://crrev.com/5671403d44971669e4d81aecf3f002188ce0e95f
> Cr-Commit-Position: refs/heads/master@{#327214}

TBR=phajdan.jr@chromium.org,clamy@chromium.org,creis@chromium.org,hajimehoshi@chromium.org,isherman@chromium.org,jeremyim@chromium.org,mattm@chromium.org,mnaganov@chromium.org,mvanouwerkerk@chromium.org,nasko@chromium.org,stevenjb@chromium.org,bengr@chromium.org,cpu@chromium.org,avi@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=369661

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

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

1 files changed, 19 insertions, 36 deletions

diff --git a/content/test/test_render_frame_host.h b/content/test/test_render_frame_host.h
index 3b0c9ae..798479f 100644
--- a/content/test/test_render_frame_host.h
+++ b/content/test/test_render_frame_host.h
@@ -52,50 +52,35 @@ class TestRenderFrameHost : public RenderFrameHostImpl,
 
   // 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 @@ class TestRenderFrameHost : public RenderFrameHostImpl,
       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.