Fix mis-classification of navigations when there is a pending page.

content/browser/frame_host/navigation_controller_impl.cc

 // Copyright 2013 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/browser/frame_host/navigation_controller_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 1015 matching lines @@
     DCHECK(GetLastCommittedEntry());
     return NAVIGATION_TYPE_AUTO_SUBFRAME;
   }
 
   // Anything below here we know is a main frame navigation.
   if (pending_entry_ &&
       !pending_entry_->is_renderer_initiated() &&
       existing_entry != pending_entry_ &&
       pending_entry_->GetPageID() == -1 &&
       existing_entry == GetLastCommittedEntry()) {
-    const std::vector<GURL>& existing_redirect_chain =
-        existing_entry->GetRedirectChain();
-
-    if (existing_entry->GetURL() == pending_entry_->GetURL() ||
-        (existing_redirect_chain.size() &&
-         existing_redirect_chain[0] == pending_entry_->GetURL())) {
+    if (params.url == pending_entry_->GetURL() ||

[Charlie Reis, 2015/05/01 19:40:48]

I think we should be comparing params.url to existing_entry->GetURL(), right?

Consider the case that the replaceState URL matches the stalled (pending) url2. 
We want to consider the replaceState as in-page, not same-page, because we're
comparing against the last committed entry and not the pending one.

[Avi (use Gerrit), 2015/05/01 20:30:57]

Yeah, that sounds right. Let me update the patch and also think about it a lot.

+        (params.redirects.size() &&
+         params.redirects[0] == pending_entry_->GetURL())) {
       // In this case, we have a pending entry for a URL but WebCore didn't do a
       // new navigation. This happens when you press enter in the URL bar to
       // reload. We will create a pending entry, but WebKit will convert it to
       // a reload since it's the same page and not create a new entry for it
       // (the user doesn't want to have a new back/forward entry when they do
       // this). If this matches the last committed entry, we want to just ignore
       // the pending entry and go back to where we were (the "existing entry").
       return NAVIGATION_TYPE_SAME_PAGE;
     }
   }
@@ skipping 817 matching lines @@
     }
   }
 }
 
 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
     const base::Callback<base::Time()>& get_timestamp_callback) {
   get_timestamp_callback_ = get_timestamp_callback;
 }
 
 }  // namespace content