[Mac] Desaturate the Favicon for Network Errors

chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm

Index: chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm
diff --git a/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm b/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm
index 348cf20030e259e4998c894867f326f02ab4ebf3..6cf8a116a0c9dddb96242128319ffff8655ee76f 100644
--- a/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm
@@ -29,12 +29,12 @@ NSImage* FaviconForWebContents(content::WebContents* contents, SkColor color) {
       contents ? favicon::ContentFaviconDriver::FromWebContents(contents)
                : nullptr;
   if (favicon_driver && favicon_driver->FaviconIsValid()) {
-    NSImage* image = favicon_driver->GetFavicon().AsNSImage();
+    NSImage* image = favicon_driver->GetFavicon().ToNSImage();
+
     // The |image| could be nil if the bitmap is null. In that case, fallback

[Nico, 2016/09/15 16:58:37]

Is this still true now that you switched the call above from AsNSImage() to
ToNSImage()? I though the main difference between the two is that the former
asserts when called on an empty bitmap, while the latter returns nil there.

[spqchan, 2016/09/15 22:07:04]

Good point, the change was accidental

     // to the default image.
-    if (image) {
+    if (image)
       return image;
-    }
   }
 
   if (ui::MaterialDesignController::IsModeMaterial()) {