Fix: Certain redirections remove sites from the history...

chrome/browser/tab_contents/navigation_controller.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/tab_contents/navigation_controller.h"
 
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 447 matching lines @@
   // TODO(brettw) this seems slightly bogus as we don't really know if the
   // pending entry is what this navigation is for. There is a similar TODO
   // w.r.t. the pending entry in RendererDidNavigateToNewPage.
   if (pending_entry_index_ >= 0)
     pending_entry_->set_site_instance(tab_contents_->GetSiteInstance());
 
   // Do navigation-type specific actions. These will make and commit an entry.
   details->type = ClassifyNavigation(params);
   switch (details->type) {
     case NavigationType::NEW_PAGE:
-      RendererDidNavigateToNewPage(params);
+      RendererDidNavigateToNewPage(params, &(details->did_replace_entry));
       break;
     case NavigationType::EXISTING_PAGE:
       RendererDidNavigateToExistingPage(params);
       break;
     case NavigationType::SAME_PAGE:
       RendererDidNavigateToSamePage(params);
       break;
     case NavigationType::IN_PAGE:
-      RendererDidNavigateInPage(params);
+      RendererDidNavigateInPage(params, &(details->did_replace_entry));
       break;
     case NavigationType::NEW_SUBFRAME:
       RendererDidNavigateNewSubframe(params);
       break;
     case NavigationType::AUTO_SUBFRAME:
       if (!RendererDidNavigateAutoSubframe(params))
         return false;
       break;
     case NavigationType::NAV_IGNORE:
       // There is nothing we can do with this navigation, so we just return to
@@ skipping 122 matching lines @@
   }
   return params.redirects.size() > 1;
 }
 
 bool NavigationController::IsLikelyAutoNavigation(base::TimeTicks now) {
   return !user_gesture_observed_ &&
          (now - last_document_loaded_) < kMaxAutoNavigationTimeDelta;
 }
 
 void NavigationController::RendererDidNavigateToNewPage(
-    const ViewHostMsg_FrameNavigate_Params& params) {
+    const ViewHostMsg_FrameNavigate_Params& params, bool* did_replace_entry) {
   NavigationEntry* new_entry;
   if (pending_entry_) {
     // TODO(brettw) this assumes that the pending entry is appropriate for the
     // new page that was just loaded. I don't think this is necessarily the
     // case! We should have some more tracking to know for sure. This goes along
     // with a similar TODO at the top of RendererDidNavigate where we blindly
     // set the site instance on the pending entry.
     new_entry = new NavigationEntry(*pending_entry_);
 
     // Don't use the page type from the pending entry. Some interstitial page
@@ skipping 10 matching lines @@
   new_entry->set_transition_type(params.transition);
   new_entry->set_site_instance(tab_contents_->GetSiteInstance());
   new_entry->set_has_post_data(params.is_post);
 
   // If the current entry is a redirection source and the redirection has
   // occurred within kMaxAutoNavigationTimeDelta since the last document load,
   // this is likely to be machine-initiated redirect and the entry needs to be
   // replaced with the new entry to avoid unwanted redirections in navigating
   // backward/forward.
   // Otherwise, just insert the new entry.
-  InsertOrReplaceEntry(new_entry,
-      IsRedirect(params) && IsLikelyAutoNavigation(base::TimeTicks::Now()));
+  *did_replace_entry = IsRedirect(params) &&
+                       IsLikelyAutoNavigation(base::TimeTicks::Now());
+  InsertOrReplaceEntry(new_entry, *did_replace_entry);
 }
 
 void NavigationController::RendererDidNavigateToExistingPage(
     const ViewHostMsg_FrameNavigate_Params& params) {
   // We should only get here for main frame navigations.
   DCHECK(PageTransition::IsMainFrame(params.transition));
 
   // This is a back/forward navigation. The existing page for the ID is
   // guaranteed to exist by ClassifyNavigation, and we just need to update it
   // with new information from the renderer.
@@ skipping 37 matching lines @@
   // a regular user-initiated navigation.
   existing_entry->set_unique_id(pending_entry_->unique_id());
 
   // The URL may have changed due to redirects.
   existing_entry->set_url(params.url);
 
   DiscardNonCommittedEntries();
 }
 
 void NavigationController::RendererDidNavigateInPage(
-    const ViewHostMsg_FrameNavigate_Params& params) {
+    const ViewHostMsg_FrameNavigate_Params& params, bool* did_replace_entry) {
   DCHECK(PageTransition::IsMainFrame(params.transition)) <<
       "WebKit should only tell us about in-page navs for the main frame.";
   // We're guaranteed to have an entry for this one.
   NavigationEntry* existing_entry = GetEntryWithPageID(
       tab_contents_->GetSiteInstance(),
       params.page_id);
 
   // Reference fragment navigation. We're guaranteed to have the last_committed
   // entry and it will be the same page as the new navigation (minus the
   // reference fragments, of course).
   NavigationEntry* new_entry = new NavigationEntry(*existing_entry);
   new_entry->set_page_id(params.page_id);
   new_entry->set_url(params.url);
-  InsertOrReplaceEntry(new_entry,
-      IsRedirect(params) && IsLikelyAutoNavigation(base::TimeTicks::Now()));
+  *did_replace_entry = IsRedirect(params) &&
+                       IsLikelyAutoNavigation(base::TimeTicks::Now());
+  InsertOrReplaceEntry(new_entry, *did_replace_entry);
 }
 
 void NavigationController::RendererDidNavigateNewSubframe(
     const ViewHostMsg_FrameNavigate_Params& params) {
   if (PageTransition::StripQualifier(params.transition) ==
       PageTransition::AUTO_SUBFRAME) {
     // This is not user-initiated. Ignore.
     return;
   }
   if (IsRedirect(params)) {
@@ skipping 283 matching lines @@
       return i;
   }
   return -1;
 }
 
 NavigationEntry* NavigationController::GetTransientEntry() const {
   if (transient_entry_index_ == -1)
     return NULL;
   return entries_[transient_entry_index_].get();
 }