Favicon url is used only if it is valid

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 2524 matching lines @@
 }
 
 - (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;
+  BOOL hasFavicon = NO;
   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;
     }
+    BOOL isAppleTouch = YES;
     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>()));
+    else
+      isAppleTouch = NO;
+    GURL url = GURL(href);
+    if (url.is_valid()) {
+      urls.push_back(web::FaviconURL(url, icon_type, std::vector<gfx::Size>()));
+      hasFavicon = hasFavicon || !isAppleTouch;
+    }
+  }
+  if (!hasFavicon) {

[Eugene But (OOO till 7-30), 2017/05/17 14:18:19]

Do you need this variable? Do you want to use |if (urls.empty())| instead and
then remove |if (!urls.empty())| check?

[gambard, 2017/05/17 16:05:37]

The javascript code added the default favicon only if it was non apple touch. I
did the same behavior here (i.e. the urls might not be empty).

[Eugene But (OOO till 7-30), 2017/05/17 18:30:18]

Thanks for explanation. Could you please specify that in the comments.

[gambard, 2017/05/18 07:20:56]

Done.

+    id origin = context[kOriginURLKey];
+    if (origin) {
+      NSURL* originURL = base::mac::ObjCCastStrict<NSURL>(origin);

[Eugene But (OOO till 7-30), 2017/05/17 14:18:19]

Could you please convert this to GURL and use GURL API instead. In Chromium we
avoid using NSURL unless it should be passed to SDK methods.

[Eugene But (OOO till 7-30), 2017/05/17 14:18:19]

Do you want to move comments from JS which explained this code?

[gambard, 2017/05/17 16:05:37]

Done.

[gambard, 2017/05/17 16:05:37]

Done.

+      if ([originURL.scheme isEqualToString:@"http"] ||
+          [originURL.scheme isEqualToString:@"https"]) {
+        NSURLComponents* URLComponents = [[NSURLComponents alloc] init];
+        URLComponents.scheme = originURL.scheme;
+        URLComponents.host = originURL.host;
+        URLComponents.path = @"/favicon.ico";
+        NSURL* defaultFaviconURL = URLComponents.URL;
+        urls.push_back(web::FaviconURL(net::GURLWithNSURL(defaultFaviconURL),
+                                       web::FaviconURL::FAVICON,
+                                       std::vector<gfx::Size>()));
+      }
+    }
   }
   if (!urls.empty())
     _webStateImpl->OnFaviconUrlUpdated(urls);
   return YES;
 }
 
 - (BOOL)handleDocumentSubmitMessage:(base::DictionaryValue*)message
                             context:(NSDictionary*)context {
   std::string href;
   if (!message->GetString("href", &href)) {
@@ skipping 2588 matching lines @@
 - (NSUInteger)observerCount {
   DCHECK_EQ(_observerBridges.size(), [_observers count]);
   return [_observers count];
 }
 
 - (NSString*)referrerFromNavigationAction:(WKNavigationAction*)action {
   return [action.request valueForHTTPHeaderField:kReferrerHeaderName];
 }
 
 @end