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 1014 matching lines @@
     // entry list, we're guaranteed to have a last committed entry.
     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())) {
-      // 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;
-    }
+      existing_entry == GetLastCommittedEntry() &&
+      !params.was_within_same_page &&

[Charlie Reis, 2015/05/01 21:37:09]

And just for posterity, this looks correct to me because the (confusingly named
in this case) |was_within_same_page| is true for things like replaceState (which
get classified as IN_PAGE) and false for the "hit enter to reload" case (which
gets classified as SAME_PAGE).

[Avi (use Gerrit), 2015/05/01 21:41:55]

This line is what allows NavigationTypeClassification_On1InPageTo1While1Pending
to pass.

+      (params.url == existing_entry->GetURL() ||
+       (params.redirects.size() &&
+        params.redirects[0] == existing_entry->GetURL()))) {
+    // In this case, we have a pending entry for a URL but Blink 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 Blink 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;
   }
 
   // Any toplevel navigations with the same base (minus the reference fragment)
   // are in-page navigations. We weeded out subframe navigations above. Most of
   // the time this doesn't matter since WebKit doesn't tell us about subframe
   // navigations that don't actually navigate, but it can happen when there is
   // an encoding override (it always sends a navigation request).
   if (AreURLsInPageNavigation(existing_entry->GetURL(), params.url,
                               params.was_within_same_page, rfh)) {
     return NAVIGATION_TYPE_IN_PAGE;
@@ skipping 808 matching lines @@
     }
   }
 }
 
 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
     const base::Callback<base::Time()>& get_timestamp_callback) {
   get_timestamp_callback_ = get_timestamp_callback;
 }
 
 }  // namespace content