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

content/test/test_web_contents.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/test/test_web_contents.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "content/browser/browser_url_handler_impl.h"
@@ skipping 49 matching lines @@
           switches::kEnableBrowserSideNavigation)) {
     return static_cast<TestRenderFrameHost*>(
         GetRenderManager()->speculative_render_frame_host_.get());
   }
   return static_cast<TestRenderFrameHost*>(
       GetRenderManager()->pending_frame_host());
 }
 
 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);
 }
 
 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;
   params.redirects = std::vector<GURL>();
   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;
   params.is_post = false;
   params.page_state = PageState::CreateFromURL(url);
 
   RenderFrameHostImpl* rfhi =
       static_cast<RenderFrameHostImpl*>(render_frame_host);
   rfhi->frame_tree_node()->navigator()->DidNavigate(rfhi, params);
 }
@@ skipping 70 matching lines @@
   TestRenderFrameHost* rfh = GetPendingMainFrame();
   if (!rfh)
     rfh = old_rfh;
 
   int page_id = entry->GetPageID();
   if (page_id == -1) {
     // It's a new navigation, assign a never-seen page id to it.
     page_id = GetMaxPageIDForSiteInstance(rfh->GetSiteInstance()) + 1;
   }
 
-  rfh->SendNavigate(page_id, entry->GetURL());
+  rfh->SendNavigate(page_id, entry->GetUniqueID(),
+                    GetController().GetPendingEntryIndex() == -1,

[Charlie Reis, 2015/04/22 05:27:25]

Interesting.  This probably doesn't equal did_create_entry in all cases in
practice (e.g., if the pending entry gets canceled or replaced), but I think it
looks right for unit tests (especially given that we verify there's a pending
entry at the top of this function).  Works for me.

[Avi (use Gerrit), 2015/04/22 18:31:51]

This whole thing is fakery for unit tests, and while this is definitely a "good
enough" deal, I'm OK with it too.

+                    entry->GetURL());
   // Simulate the SwapOut_ACK. This is needed when cross-site navigation
   // happens.
   if (old_rfh != rfh)
     old_rfh->OnSwappedOut();
 }
 
 void TestWebContents::ProceedWithCrossSiteNavigation() {
   if (!GetPendingMainFrame())
     return;
   GetMainFrame()->SendBeforeUnloadACK(true);
@@ skipping 73 matching lines @@
 }
 
 void TestWebContents::ShowCreatedWidget(int route_id,
                                         const gfx::Rect& initial_rect) {
 }
 
 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) {
 }
 
 }  // namespace content