[Material][Mac] Fix Default Favicon's Color

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 80 matching lines @@
 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();
     // The |image| could be nil if the bitmap is null. In that case, fallback
     // to the default image.
-    if (image) {
+    if (image)
       return image;
-    }
   }
 
+  return DefaultFavicon(color);
+}
+
+NSImage* DefaultFavicon(SkColor color) {
   if (ui::MaterialDesignController::IsModeMaterial())
     return [DefaultFaviconImageRep imageForColor:color];
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToNSImage();
 }
 
+bool ShouldUseDefaultFavicon(content::WebContents* contents) {
+  favicon::FaviconDriver* favicon_driver =
+      contents ? favicon::ContentFaviconDriver::FromWebContents(contents)
+               : nullptr;
+  if (favicon_driver && favicon_driver->FaviconIsValid())
+    return favicon_driver->GetFavicon().IsEmpty();
+
+  return YES;
+}
+
 }  // namespace mac