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

chrome/browser/history/history_tab_helper.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 "chrome/browser/history/history_tab_helper.h"
 
 #include <utility>
 
 #include "build/build_config.h"
 #include "chrome/browser/history/history_service_factory.h"
@@ skipping 60 matching lines @@
     base::Time timestamp,
     int nav_entry_id,
     content::NavigationHandle* navigation_handle) {
   // Clicks on content suggestions on the NTP should not contribute to the
   // Most Visited tiles in the NTP.
   const bool consider_for_ntp_most_visited =
       navigation_handle->GetReferrer().url != kChromeContentSuggestionsReferrer;
 
   history::HistoryAddPageArgs add_page_args(
       navigation_handle->GetURL(), timestamp,
-      history::ContextIDForWebContents(web_contents()),
-      nav_entry_id, navigation_handle->GetReferrer().url,
+      history::ContextIDForWebContents(web_contents()), nav_entry_id,
+      navigation_handle->GetReferrer().url,
       navigation_handle->GetRedirectChain(),
       navigation_handle->GetPageTransition(), history::SOURCE_BROWSED,
-      navigation_handle->DidReplaceEntry(), consider_for_ntp_most_visited);
+      navigation_handle->DidReplaceEntry()
+          ? base::Optional<GURL>(navigation_handle->GetPreviousURL())
+          : base::nullopt,
+      consider_for_ntp_most_visited);
   if (ui::PageTransitionIsMainFrame(navigation_handle->GetPageTransition()) &&
       virtual_url != navigation_handle->GetURL()) {
     // Hack on the "virtual" 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 virtual URL as a redirect.  This
     // only applies to the main frame, as the virtual URL doesn't apply to
     // sub-frames.
     add_page_args.url = virtual_url;
     if (!add_page_args.redirects.empty())
@@ skipping 97 matching lines @@
   if (hs) {
     NavigationEntry* entry = tab->GetController().GetLastCommittedEntry();
     history::ContextID context_id = history::ContextIDForWebContents(tab);
     if (entry) {
       hs->UpdateWithPageEndTime(context_id, entry->GetUniqueID(), tab->GetURL(),
                                 base::Time::Now());
     }
     hs->ClearCachedDataForContextID(context_id);
   }
 }