[WIP] Fix history.replaceState() not propagating back favicons

components/history/core/browser/history_backend.cc

 // Copyright (c) 2012 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 "components/history/core/browser/history_backend.h"
 
 #include <algorithm>
 #include <functional>
 #include <list>
 #include <map>
@@ skipping 65 matching lines @@
 
 namespace {
 
 void RunUnlessCanceled(
     const base::Closure& closure,
     const base::CancelableTaskTracker::IsCanceledCallback& is_canceled) {
   if (!is_canceled.Run())
     closure.Run();
 }
 
+void ConcatMoveRedirectList(RedirectList* source, RedirectList* output) {
+  if (source->empty())
+    return;
+
+  if (output->empty()) {
+    *output = std::move(*source);
+  } else {
+    output->reserve(output->size() + source->size());
+    for (GURL& redirect : *source)
+      output->push_back(std::move(redirect));
+  }
+}
+
 }  // namespace
 
 // How long we'll wait to do a commit, so that things are batched together.
 const int kCommitIntervalSeconds = 10;
 
 // The amount of time before we re-fetch the favicon.
 const int kFaviconRefetchDays = 7;
 
 // The maximum number of items we'll allow in the redirect list before
 // deleting some.
@@ skipping 388 matching lines @@
     // consider both to have been "navigated to".
     if (IsUntypedIntranetHost(request.url) ||
         (has_redirects && IsUntypedIntranetHost(request.redirects[0]))) {
       request_transition = ui::PageTransitionFromInt(
           ui::PAGE_TRANSITION_TYPED |
           ui::PageTransitionGetQualifier(request_transition));
     }
   }
 
   RedirectList extended_redirect_chain;
+  RedirectList redirects = request.redirects;
 
   if (!has_redirects) {
     // The single entry is both a chain start and end.
     ui::PageTransition t = ui::PageTransitionFromInt(
         request_transition | ui::PAGE_TRANSITION_CHAIN_START |
         ui::PAGE_TRANSITION_CHAIN_END);
 
     // No redirect case (one element means just the page itself).
     last_ids = AddPageVisit(request.url, request.time, last_ids.second, t,
                             request.visit_source);
 
     // Update the segment for this visit. KEYWORD_GENERATED visits should not
     // result in changing most visited, so we don't update segments (most
     // visited db).
     if (!is_keyword_generated && request.consider_for_ntp_most_visited) {
       UpdateSegments(request.url, from_visit_id, last_ids.second, t,
                      request.time);
 
       // Update the referrer's duration.
       UpdateVisitDuration(from_visit_id, request.time);
     }
   } else {
     // Redirect case. Add the redirect chain.
 
     ui::PageTransition redirect_info = ui::PAGE_TRANSITION_CHAIN_START;
-
-    RedirectList redirects = request.redirects;
     if (redirects[0].SchemeIs(url::kAboutScheme)) {
       // When the redirect source + referrer is "about" we skip it. This
       // happens when a page opens a new frame/window to about:blank and then
       // script sets the URL to somewhere else (used to hide the referrer). It
       // would be nice to keep all these redirects properly but we don't ever
       // see the initial about:blank load, so we don't know where the
       // subsequent client redirect came from.
       //
       // In this case, we just don't bother hooking up the source of the
       // redirects, so we remove it.
@@ skipping 11 matching lines @@
       // chain.
       if (request.referrer.is_valid()) {
         DCHECK_EQ(request.referrer, redirects[0]);
         redirects.erase(redirects.begin());
 
         // 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.
         VisitRow visit_row;
-        if (request.did_replace_entry &&
+        if (request.replaced_entry_url.has_value() &&
             db_->GetRowForVisit(last_ids.second, &visit_row) &&
             visit_row.transition & ui::PAGE_TRANSITION_CHAIN_END) {
           visit_row.transition = ui::PageTransitionFromInt(
               visit_row.transition & ~ui::PAGE_TRANSITION_CHAIN_END);
           db_->UpdateVisitRow(visit_row);
         }
 
         GetCachedRecentRedirects(request.referrer, &extended_redirect_chain);
       }
     }
@@ skipping 20 matching lines @@
         }
 
         // Update the visit_details for this visit.
         UpdateVisitDuration(from_visit_id, request.time);
       }
 
       // Subsequent transitions in the redirect list must all be server
       // redirects.
       redirect_info = ui::PAGE_TRANSITION_SERVER_REDIRECT;
     }
+  }
 
-    // Last, save this redirect chain for later so we can set titles & favicons
-    // on the redirected pages properly. For this we use the extended redirect
-    // chain, which includes URLs from concatenated redirects.
-    if (extended_redirect_chain.empty()) {
-      extended_redirect_chain = std::move(redirects);
-    } else {
-      extended_redirect_chain.reserve(extended_redirect_chain.size() +
-                                      redirects.size());
-      for (GURL& redirect : redirects)
-        extended_redirect_chain.push_back(std::move(redirect));
-    }
+  // If the page replaced another one in history, we treat is similarly as a
+  // redirect and propagate favicon and titles through.
+  if (request.replaced_entry_url.has_value()) {
+    RedirectList replaced_url_redirects;
+    GetCachedRecentRedirects(*request.replaced_entry_url,
+                             &replaced_url_redirects);
+    ConcatMoveRedirectList(&replaced_url_redirects, &extended_redirect_chain);
+  }
+
+  // Last, save this redirect chain for later so we can set titles & favicons
+  // on the redirected pages properly.
+  ConcatMoveRedirectList(&redirects, &extended_redirect_chain);
+
+  if (extended_redirect_chain.size() > 1)
     recent_redirects_.Put(request.url, extended_redirect_chain);
-  }
 
   // TODO(brettw) bug 1140015: Add an "add page" notification so the history
   // views can keep in sync.
 
   // Add the last visit to the tracker so we can get outgoing transitions.
   // TODO(evanm): Due to http://b/1194536 we lose the referrers of a subframe
   // navigation anyway, so last_visit_id is always zero for them.  But adding
   // them here confuses main frame history, so we skip them for now.
   if (!ui::PageTransitionCoreTypeIs(request_transition,
                                     ui::PAGE_TRANSITION_AUTO_SUBFRAME) &&
@@ skipping 2049 matching lines @@
   // transaction is currently open.
   db_->CommitTransaction();
   db_->Vacuum();
   db_->BeginTransaction();
   db_->GetStartDate(&first_recorded_time_);
 
   return true;
 }
 
 }  // namespace history