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

chrome/browser/history/history_backend.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/history/history_backend.h"
 
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
@@ skipping 384 matching lines @@
       // transition to client redirect.
       //
       // The referrer is invalid when restoring a session that features an
       // https tab that redirects to a different host or to http. In this
       // case we don't need to reconnect the new redirect with the existing
       // chain.
       if (request->referrer.is_valid()) {
         DCHECK(request->referrer == request->redirects[0]);
         request->redirects.erase(request->redirects.begin());
 
-        // Make sure to remove the CHAIN_END marker from the first visit. This
+        // If the navigation entry for this visit has replaced that for the
+        // first visit, remove the CHAIN_END marker from the first visit. This
         // can be called a lot, for example, the page cycler, and most of the
         // time we won't have changed anything.
-        // TODO(brettw) this should be unit tested.
         VisitRow visit_row;
-        if (db_->GetRowForVisit(last_ids.second, &visit_row) &&
+        if (request->did_replace_entry &&
+            db_->GetRowForVisit(last_ids.second, &visit_row) &&
             visit_row.transition | PageTransition::CHAIN_END) {
           visit_row.transition &= ~PageTransition::CHAIN_END;
           db_->UpdateVisitRow(visit_row);
         }
       }
     }
 
     for (size_t redirect_index = 0; redirect_index < request->redirects.size();
          redirect_index++) {
       PageTransition::Type t = transition | redirect_info;
@@ skipping 1483 matching lines @@
   return true;
 }
 
 BookmarkService* HistoryBackend::GetBookmarkService() {
   if (bookmark_service_)
     bookmark_service_->BlockTillLoaded();
   return bookmark_service_;
 }
 
 }  // namespace history