Save favicon during reading list distillation

ios/web/web_state/ui/crw_web_controller.mm

 // Copyright 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.
 
 #import "ios/web/web_state/ui/crw_web_controller.h"
 
 #import <WebKit/WebKit.h>
 
 #import <objc/runtime.h>
 #include <stddef.h>
@@ skipping 2789 matching lines @@
   return YES;
 }
 
 - (BOOL)handleDocumentFaviconsMessage:(base::DictionaryValue*)message
                               context:(NSDictionary*)context {
   base::ListValue* favicons = nullptr;
   if (!message->GetList("favicons", &favicons)) {
     DLOG(WARNING) << "JS message parameter not found: favicons";
     return NO;
   }
+
   std::vector<web::FaviconURL> urls;
-  for (size_t fav_idx = 0; fav_idx != favicons->GetSize(); ++fav_idx) {
-    base::DictionaryValue* favicon = nullptr;
-    if (!favicons->GetDictionary(fav_idx, &favicon))
-      return NO;
-    std::string href;
-    std::string rel;
-    if (!favicon->GetString("href", &href)) {
-      DLOG(WARNING) << "JS message parameter not found: href";
-      return NO;
-    }
-    if (!favicon->GetString("rel", &rel)) {
-      DLOG(WARNING) << "JS message parameter not found: rel";
-      return NO;
-    }
-    web::FaviconURL::IconType icon_type = web::FaviconURL::FAVICON;
-    if (rel == "apple-touch-icon")
-      icon_type = web::FaviconURL::TOUCH_ICON;
-    else if (rel == "apple-touch-icon-precomposed")
-      icon_type = web::FaviconURL::TOUCH_PRECOMPOSED_ICON;
-    urls.push_back(
-        web::FaviconURL(GURL(href), icon_type, std::vector<gfx::Size>()));
-  }
-  if (!urls.empty())
+  bool extraction_result = ExtractFaviconURL(favicons, urls);
+
+  if (extraction_result && !urls.empty())
     _webStateImpl->OnFaviconUrlUpdated(urls);
-  return YES;
+  return extraction_result;
 }
 
 - (BOOL)handleDocumentSubmitMessage:(base::DictionaryValue*)message
                             context:(NSDictionary*)context {
   std::string href;
   if (!message->GetString("href", &href)) {
     DLOG(WARNING) << "JS message parameter not found: href";
     return NO;
   }
   const GURL targetURL(href);
@@ skipping 2922 matching lines @@
   }
 
   return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC;
 }
 
 - (NSString*)refererFromNavigationAction:(WKNavigationAction*)action {
   return [action.request valueForHTTPHeaderField:@"Referer"];
 }
 
 @end