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

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2009 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/tab_contents.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 1228 matching lines @@
   // reload the page to stop blocking.
   suppress_javascript_messages_ = false;
 
   // Update history. Note that this needs to happen after the entry is complete,
   // which WillNavigate[Main,Sub]Frame will do before this function is called.
   if (params.should_update_history) {
     // Most of the time, the displayURL matches the loaded URL, but for about:
     // URLs, we use a data: URL as the real value.  We actually want to save
     // the about: URL to the history db and keep the data: URL hidden. This is
     // what the TabContents' URL getter does.
-    UpdateHistoryForNavigation(GetURL(), params);
+    UpdateHistoryForNavigation(GetURL(), details, params);
   }
 
   // Notify the password manager of the navigation or form submit.
   // TODO(brettw) bug 1343111: Password manager stuff in here needs to be
   // cleaned up and covered by tests.
   if (params.password_form.origin.is_valid())
     GetPasswordManager()->ProvisionallySavePassword(params.password_form);
 }
 
 void TabContents::MaybeCloseChildWindows(const GURL& previous_url,
@@ skipping 51 matching lines @@
       // the max.
       if (curr_max_page_id < 0)
         curr_max_page_id = 0;
       rvh->ReservePageIDRange(max_restored_page_id - curr_max_page_id);
     }
   }
 }
 
 void TabContents::UpdateHistoryForNavigation(
     const GURL& display_url,
+    const NavigationController::LoadCommittedDetails& details,
     const ViewHostMsg_FrameNavigate_Params& params) {
   if (profile()->IsOffTheRecord())
     return;
 
   // Add to history service.
   HistoryService* hs = profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
   if (hs) {
     if (PageTransition::IsMainFrame(params.transition) &&
         display_url != params.url) {
       // Hack on the "display" URL so that it will appear in history. For some
       // types of URLs, we will display a magic URL that is different from where
       // the page is actually navigated. We want the user to see in history
       // what they saw in the URL bar, so we add the display URL as a redirect.
       // This only applies to the main frame, as the display URL doesn't apply
       // to sub-frames.
       std::vector<GURL> redirects = params.redirects;
       if (!redirects.empty())
         redirects.back() = display_url;
       hs->AddPage(display_url, this, params.page_id, params.referrer,
-                  params.transition, redirects);
+                  params.transition, redirects, details.did_replace_entry);
     } else {
       hs->AddPage(params.url, this, params.page_id, params.referrer,
-                  params.transition, params.redirects);
+                  params.transition, params.redirects,
+                  details.did_replace_entry);
     }
   }
 }
 
 bool TabContents::UpdateTitleForEntry(NavigationEntry* entry,
                                       const std::wstring& title) {
   // For file URLs without a title, use the pathname instead. In the case of a
   // synthesized title, we don't want the update to count toward the "one set
   // per page of the title to history."
   std::wstring final_title;
@@ skipping 987 matching lines @@
       NavigationController::LoadCommittedDetails& committed_details =
           *(Details<NavigationController::LoadCommittedDetails>(details).ptr());
       ExpireInfoBars(committed_details);
       break;
     }
 
     default:
       NOTREACHED();
   }
 }