[Reading List] Display the redirected URL's favicon.

ios/chrome/browser/reading_list/reading_list_distiller_page.mm

 // Copyright 2016 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 "ios/chrome/browser/reading_list/reading_list_distiller_page.h"
 
 #include "base/bind.h"
 #include "base/mac/foundation_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 36 matching lines @@
 ReadingListDistillerPage::~ReadingListDistillerPage() {}
 
 void ReadingListDistillerPage::DistillPageImpl(const GURL& url,
                                                const std::string& script) {
   std::unique_ptr<web::WebState> old_web_state = DetachWebState();
   if (old_web_state) {
     web_state_dispatcher_->ReturnWebState(std::move(old_web_state));
   }
   std::unique_ptr<web::WebState> new_web_state =
       web_state_dispatcher_->RequestWebState();
-  if (new_web_state) {
-    favicon::WebFaviconDriver* favicon_driver =
-        favicon::WebFaviconDriver::FromWebState(new_web_state.get());
-    favicon_driver->FetchFavicon(url);
-  }
   AttachWebState(std::move(new_web_state));
   original_url_ = url;
+  FetchFavicon(url);
 
   DistillerPageIOS::DistillPageImpl(url, script);
 }
 
+void ReadingListDistillerPage::FetchFavicon(const GURL& page_url) {
+  if (!CurrentWebState() || !page_url.is_valid()) {
+    return;
+  }
+  favicon::WebFaviconDriver* favicon_driver =
+      favicon::WebFaviconDriver::FromWebState(CurrentWebState());
+  DCHECK(favicon_driver);
+  favicon_driver->FetchFavicon(page_url);
+}
+
 void ReadingListDistillerPage::OnDistillationDone(const GURL& page_url,
                                                   const base::Value* value) {
   std::unique_ptr<web::WebState> old_web_state = DetachWebState();
   if (old_web_state) {
     web_state_dispatcher_->ReturnWebState(std::move(old_web_state));
   }
   DistillerPageIOS::OnDistillationDone(page_url, value);
 }
 
 bool ReadingListDistillerPage::IsLoadingSuccess(
@@ skipping 32 matching lines @@
   }
   delegate_->DistilledPageHasMimeType(original_url_,
                                       CurrentWebState()->GetContentsMimeType());
   if (!CurrentWebState()->ContentIsHTML()) {
     // If content is not HTML, distillation will fail immediatly.
     // Call the handler to make sure cleaning methods are called correctly.
     // There is no need to wait for rendering either.
     DistillerPageIOS::OnLoadURLDone(load_completion_status);
     return;
   }
+  FetchFavicon(CurrentWebState()->GetVisibleURL());
+
   // Page is loaded but rendering may not be done yet. Give a delay to the page.
   base::WeakPtr<ReadingListDistillerPage> weak_this =
       weak_ptr_factory_.GetWeakPtr();
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&ReadingListDistillerPage::DelayedOnLoadURLDone, weak_this),
       base::TimeDelta::FromSeconds(kPageLoadDelayInSeconds));
 }
 
 void ReadingListDistillerPage::DelayedOnLoadURLDone() {
@@ skipping 76 matching lines @@
   bool is_cdn_ampproject_subdomain =
       [[new_url host] hasSuffix:@".cdn.ampproject.org"];
 
   if (!is_cdn_ampproject && !is_cdn_ampproject_subdomain) {
     return false;
   }
   GURL new_gurl = net::GURLWithNSURL(new_url);
   if (!new_gurl.is_valid()) {
     return false;
   }
+  FetchFavicon(new_gurl);
   web::NavigationManager::WebLoadParams params(new_gurl);
   CurrentWebState()->GetNavigationManager()->LoadURLWithParams(params);
   return true;
 }
 
 }  // namespace reading_list