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

Reason for revert:
This still breaks Instrumentation test AndroidWebViewTest.
failures:
org.chromium.android_webview.test.LoadDataWithBaseUrlTest#testOnPageFinishedUrlIsBaseUrl

http://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20%28dbg%29/builds/27757/steps/Instrumentation%20test%20AndroidWebViewTest/logs/stdio

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}
>
> 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}

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,nkostylev@chromium.org,avi@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=369661

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

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

6 files changed, 45 insertions, 111 deletions

diff --git a/content/test/test_render_frame_host.cc b/content/test/test_render_frame_host.cc
index 838c423..bc54c3c 100644
--- a/content/test/test_render_frame_host.cc
+++ b/content/test/test_render_frame_host.cc
@@ -79,6 +79,13 @@ TestRenderFrameHost* TestRenderFrameHost::AppendChild(
       child_creation_observer_.last_created_frame());
 }
 
+void TestRenderFrameHost::SendNavigateWithTransition(
+    int page_id,
+    const GURL& url,
+    ui::PageTransition transition) {
+  SendNavigateWithTransitionAndResponseCode(page_id, url, transition, 200);
+}
+
 void TestRenderFrameHost::SetContentsMimeType(const std::string& mime_type) {
   contents_mime_type_ = mime_type;
 }
@@ -92,39 +99,18 @@ void TestRenderFrameHost::SimulateSwapOutACK() {
   OnSwappedOut();
 }
 
-void TestRenderFrameHost::SendNavigate(int page_id,
-                                       int nav_entry_id,
-                                       bool did_create_new_entry,
-                                       const GURL& url) {
-  SendNavigateWithTransition(page_id, nav_entry_id, did_create_new_entry, url,
-                             ui::PAGE_TRANSITION_LINK);
-}
-
-void TestRenderFrameHost::SendFailedNavigate(int page_id,
-                                             int nav_entry_id,
-                                             bool did_create_new_entry,
-                                             const GURL& url) {
-  SendNavigateWithTransitionAndResponseCode(page_id, nav_entry_id,
-                                            did_create_new_entry, url,
-                                            ui::PAGE_TRANSITION_RELOAD, 500);
+void TestRenderFrameHost::SendNavigate(int page_id, const GURL& url) {
+  SendNavigateWithTransition(page_id, url, ui::PAGE_TRANSITION_LINK);
 }
 
-void TestRenderFrameHost::SendNavigateWithTransition(
-    int page_id,
-    int nav_entry_id,
-    bool did_create_new_entry,
-    const GURL& url,
-    ui::PageTransition transition) {
+void TestRenderFrameHost::SendFailedNavigate(int page_id, const GURL& url) {
   SendNavigateWithTransitionAndResponseCode(
-      page_id, nav_entry_id, did_create_new_entry, url, transition, 200);
+      page_id, url, ui::PAGE_TRANSITION_RELOAD, 500);
 }
 
 void TestRenderFrameHost::SendNavigateWithTransitionAndResponseCode(
     int page_id,
-    int nav_entry_id,
-    bool did_create_new_entry,
-    const GURL& url,
-    ui::PageTransition transition,
+    const GURL& url, ui::PageTransition transition,
     int response_code) {
   // DidStartProvisionalLoad may delete the pending entry that holds |url|,
   // so we keep a copy of it to use in SendNavigateWithParameters.
@@ -135,15 +121,12 @@ void TestRenderFrameHost::SendNavigateWithTransitionAndResponseCode(
   SetRenderFrameCreated(true);
 
   OnDidStartProvisionalLoadForFrame(url_copy, false);
-  SendNavigateWithParameters(page_id, nav_entry_id, did_create_new_entry,
-                             url_copy, transition, url_copy, response_code, 0,
-                             std::vector<GURL>());
+  SendNavigateWithParameters(page_id, url_copy, transition, url_copy,
+      response_code, 0, std::vector<GURL>());
 }
 
 void TestRenderFrameHost::SendNavigateWithOriginalRequestURL(
     int page_id,
-    int nav_entry_id,
-    bool did_create_new_entry,
     const GURL& url,
     const GURL& original_request_url) {
   // Ensure that the RenderFrameCreated notification has been sent to observers
@@ -151,20 +134,16 @@ void TestRenderFrameHost::SendNavigateWithOriginalRequestURL(
   SetRenderFrameCreated(true);
 
   OnDidStartProvisionalLoadForFrame(url, false);
-  SendNavigateWithParameters(page_id, nav_entry_id, did_create_new_entry, url,
-                             ui::PAGE_TRANSITION_LINK, original_request_url,
-                             200, 0, std::vector<GURL>());
+  SendNavigateWithParameters(page_id, url, ui::PAGE_TRANSITION_LINK,
+      original_request_url, 200, 0, std::vector<GURL>());
 }
 
 void TestRenderFrameHost::SendNavigateWithFile(
     int page_id,
-    int nav_entry_id,
-    bool did_create_new_entry,
     const GURL& url,
     const base::FilePath& file_path) {
-  SendNavigateWithParameters(page_id, nav_entry_id, did_create_new_entry, url,
-                             ui::PAGE_TRANSITION_LINK, url, 200, &file_path,
-                             std::vector<GURL>());
+  SendNavigateWithParameters(page_id, url, ui::PAGE_TRANSITION_LINK, url, 200,
+      &file_path, std::vector<GURL>());
 }
 
 void TestRenderFrameHost::SendNavigateWithParams(
@@ -175,18 +154,14 @@ void TestRenderFrameHost::SendNavigateWithParams(
 
 void TestRenderFrameHost::SendNavigateWithRedirects(
     int page_id,
-    int nav_entry_id,
-    bool did_create_new_entry,
     const GURL& url,
     const std::vector<GURL>& redirects) {
-  SendNavigateWithParameters(page_id, nav_entry_id, did_create_new_entry, url,
-                             ui::PAGE_TRANSITION_LINK, url, 200, 0, redirects);
+  SendNavigateWithParameters(
+      page_id, url, ui::PAGE_TRANSITION_LINK, url, 200, 0, redirects);
 }
 
 void TestRenderFrameHost::SendNavigateWithParameters(
     int page_id,
-    int nav_entry_id,
-    bool did_create_new_entry,
     const GURL& url,
     ui::PageTransition transition,
     const GURL& original_request_url,
@@ -195,7 +170,6 @@ void TestRenderFrameHost::SendNavigateWithParameters(
     const std::vector<GURL>& redirects) {
   FrameHostMsg_DidCommitProvisionalLoad_Params params;
   params.page_id = page_id;
-  params.nav_entry_id = nav_entry_id;
   params.url = url;
   params.referrer = Referrer();
   params.transition = transition;
@@ -203,7 +177,6 @@ void TestRenderFrameHost::SendNavigateWithParameters(
   params.should_update_history = true;
   params.searchable_form_url = GURL();
   params.searchable_form_encoding = std::string();
-  params.did_create_new_entry = did_create_new_entry;
   params.security_info = std::string();
   params.gesture = NavigationGestureUser;
   params.contents_mime_type = contents_mime_type_;
@@ -231,13 +204,11 @@ void TestRenderFrameHost::SendNavigateWithParameters(
   OnDidCommitProvisionalLoad(msg);
 }
 
-void TestRenderFrameHost::NavigateAndCommitRendererInitiated(
-    int page_id,
-    bool did_create_new_entry,
-    const GURL& url) {
+void TestRenderFrameHost::NavigateAndCommitRendererInitiated(int page_id,
+                                                             const GURL& url) {
   SendRendererInitiatedNavigationRequest(url, false);
   PrepareForCommit();
-  SendNavigate(page_id, 0, did_create_new_entry, url);
+  SendNavigate(page_id, url);
 }
 
 void TestRenderFrameHost::SendRendererInitiatedNavigationRequest(
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.
diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc
index bedb4b8..b6f7a86 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -28,12 +28,9 @@ namespace content {
 
 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params,
                         int page_id,
-                        int nav_entry_id,
-                        bool did_create_new_entry,
                         const GURL& url,
                         ui::PageTransition transition) {
   params->page_id = page_id;
-  params->nav_entry_id = nav_entry_id;
   params->url = url;
   params->referrer = Referrer();
   params->transition = transition;
@@ -41,7 +38,6 @@ void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params,
   params->should_update_history = false;
   params->searchable_form_url = GURL();
   params->searchable_form_encoding = std::string();
-  params->did_create_new_entry = did_create_new_entry;
   params->security_info = std::string();
   params->gesture = NavigationGestureUser;
   params->was_within_same_page = false;
diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h
index 13bc0fb..ad4ca65 100644
--- a/content/test/test_render_view_host.h
+++ b/content/test/test_render_view_host.h
@@ -40,12 +40,10 @@ class SiteInstance;
 class TestRenderFrameHost;
 class TestWebContents;
 
-// Utility function to initialize FrameHostMsg_DidCommitProvisionalLoad_Params
-// with given parameters.
+// Utility function to initialize ViewHostMsg_NavigateParams_Params
+// with given |page_id|, |url| and |transition_type|.
 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params,
                         int page_id,
-                        int nav_entry_id,
-                        bool did_create_new_entry,
                         const GURL& url,
                         ui::PageTransition transition_type);
 
diff --git a/content/test/test_web_contents.cc b/content/test/test_web_contents.cc
index 28c3980..9032fc4 100644
--- a/content/test/test_web_contents.cc
+++ b/content/test/test_web_contents.cc
@@ -67,14 +67,10 @@ TestRenderFrameHost* TestWebContents::GetPendingMainFrame() const {
 
 void TestWebContents::TestDidNavigate(RenderFrameHost* render_frame_host,
                                       int page_id,
-                                      int nav_entry_id,
-                                      bool did_create_new_entry,
                                       const GURL& url,
                                       ui::PageTransition transition) {
   TestDidNavigateWithReferrer(render_frame_host,
                               page_id,
-                              nav_entry_id,
-                              did_create_new_entry,
                               url,
                               Referrer(),
                               transition);
@@ -83,15 +79,12 @@ void TestWebContents::TestDidNavigate(RenderFrameHost* render_frame_host,
 void TestWebContents::TestDidNavigateWithReferrer(
     RenderFrameHost* render_frame_host,
     int page_id,
-    int nav_entry_id,
-    bool did_create_new_entry,
     const GURL& url,
     const Referrer& referrer,
     ui::PageTransition transition) {
   FrameHostMsg_DidCommitProvisionalLoad_Params params;
 
   params.page_id = page_id;
-  params.nav_entry_id = nav_entry_id;
   params.url = url;
   params.referrer = referrer;
   params.transition = transition;
@@ -99,7 +92,6 @@ void TestWebContents::TestDidNavigateWithReferrer(
   params.should_update_history = false;
   params.searchable_form_url = GURL();
   params.searchable_form_encoding = std::string();
-  params.did_create_new_entry = did_create_new_entry;
   params.security_info = std::string();
   params.gesture = NavigationGestureUser;
   params.was_within_same_page = false;
@@ -190,9 +182,7 @@ void TestWebContents::CommitPendingNavigation() {
     page_id = GetMaxPageIDForSiteInstance(rfh->GetSiteInstance()) + 1;
   }
 
-  rfh->SendNavigate(page_id, entry->GetUniqueID(),
-                    GetController().GetPendingEntryIndex() == -1,
-                    entry->GetURL());
+  rfh->SendNavigate(page_id, entry->GetURL());
   // Simulate the SwapOut_ACK. This is needed when cross-site navigation
   // happens.
   if (old_rfh != rfh)
diff --git a/content/test/test_web_contents.h b/content/test/test_web_contents.h
index 632d57f..66bef97 100644
--- a/content/test/test_web_contents.h
+++ b/content/test/test_web_contents.h
@@ -40,14 +40,10 @@ class TestWebContents : public WebContentsImpl, public WebContentsTester {
   void ProceedWithCrossSiteNavigation() override;
   void TestDidNavigate(RenderFrameHost* render_frame_host,
                        int page_id,
-                       int nav_entry_id,
-                       bool did_create_new_entry,
                        const GURL& url,
                        ui::PageTransition transition) override;
   void TestDidNavigateWithReferrer(RenderFrameHost* render_frame_host,
                                    int page_id,
-                                   int nav_entry_id,
-                                   bool did_create_new_entry,
                                    const GURL& url,
                                    const Referrer& referrer,
                                    ui::PageTransition transition) override;