[Mac] Desaturate the Favicon for Network Errors

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

 // 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/ui/cocoa/tab_contents/favicon_util_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
 #include "components/favicon/content/content_favicon_driver.h"
@@ skipping 11 matching lines @@
 
 }  // namespace
 
 namespace mac {
 
 NSImage* FaviconForWebContents(content::WebContents* contents, SkColor color) {
   favicon::FaviconDriver* favicon_driver =
       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()) {
     return NSImageFromImageSkia(gfx::CreateVectorIcon(
         gfx::VectorIconId::DEFAULT_FAVICON, kVectorIconSize, color));
   }
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToNSImage();
 }
 
 }  // namespace mac