Load the default favicon as a native image, rather than as a Skia image.

This silences a line of log spew that's generated on every launch of a local
debug build.

BUG=none
TEST=less log spew
R=rsesek@chromium.org
TBR=jam@chromium.org

Review URL: https://codereview.chromium.org/333493002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276787 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 18 insertions, 17 deletions

diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index f1771b4..7c3dc65 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -252,7 +252,7 @@ std::string AwContentBrowserClient::GetAcceptLangs(
   return GetAcceptLangsImpl();
 }
 
-gfx::ImageSkia* AwContentBrowserClient::GetDefaultFavicon() {
+const gfx::ImageSkia* AwContentBrowserClient::GetDefaultFavicon() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   // TODO(boliu): Bundle our own default favicon?
   return rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h
index 8bec84a..bf4abd2 100644
--- a/android_webview/browser/aw_content_browser_client.h
+++ b/android_webview/browser/aw_content_browser_client.h
@@ -57,7 +57,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
                                               int child_process_id) OVERRIDE;
   virtual std::string GetApplicationLocale() OVERRIDE;
   virtual std::string GetAcceptLangs(content::BrowserContext* context) OVERRIDE;
-  virtual gfx::ImageSkia* GetDefaultFavicon() OVERRIDE;
+  virtual const gfx::ImageSkia* GetDefaultFavicon() OVERRIDE;
   virtual bool AllowAppCache(const GURL& manifest_url,
                              const GURL& first_party,
                              content::ResourceContext* context) OVERRIDE;
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index 037c481..5663eb0 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -883,12 +883,12 @@ CookiesTreeModel::~CookiesTreeModel() {
 // Returns the set of icons for the nodes in the tree. You only need override
 // this if you don't want to use the default folder icons.
 void CookiesTreeModel::GetIcons(std::vector<gfx::ImageSkia>* icons) {
-  icons->push_back(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-      IDR_DEFAULT_FAVICON));
-  icons->push_back(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-      IDR_COOKIE_ICON));
-  icons->push_back(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-      IDR_COOKIE_STORAGE_ICON));
+  icons->push_back(*ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+      IDR_DEFAULT_FAVICON).ToImageSkia());
+  icons->push_back(*ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+      IDR_COOKIE_ICON).ToImageSkia());
+  icons->push_back(*ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+      IDR_COOKIE_STORAGE_ICON).ToImageSkia());
 }
 
 // Returns the index of the icon to use for |node|. Return -1 to use the
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 6b31153..28c9c13 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1758,9 +1758,9 @@ std::string ChromeContentBrowserClient::GetAcceptLangs(
   return profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
 }
 
-gfx::ImageSkia* ChromeContentBrowserClient::GetDefaultFavicon() {
+const gfx::ImageSkia* ChromeContentBrowserClient::GetDefaultFavicon() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  return rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
+  return rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToImageSkia();
 }
 
 bool ChromeContentBrowserClient::AllowAppCache(
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 8ee6947..dc314f0 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -134,7 +134,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
   virtual std::string GetApplicationLocale() OVERRIDE;
   virtual std::string GetAcceptLangs(
       content::BrowserContext* context) OVERRIDE;
-  virtual gfx::ImageSkia* GetDefaultFavicon() OVERRIDE;
+  virtual const gfx::ImageSkia* GetDefaultFavicon() OVERRIDE;
   virtual bool AllowAppCache(const GURL& manifest_url,
                              const GURL& first_party,
                              content::ResourceContext* context) OVERRIDE;
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index 25f80ea..71e3bf8 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -742,8 +742,9 @@ gfx::ImageSkia TaskManagerModel::GetResourceIcon(int index) const {
   if (!icon.isNull())
     return icon;
 
-  static gfx::ImageSkia* default_icon = ResourceBundle::GetSharedInstance().
-      GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
+  static const gfx::ImageSkia* default_icon =
+      ResourceBundle::GetSharedInstance().
+      GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToImageSkia();
   return *default_icon;
 }
 
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc
index e7058f7..40b2dd9 100644
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -36,7 +36,7 @@ static const int kExtensionGroupID = 2;
 // ModelEntry also tracks state information about the URL.
 
 // Icon used while loading, or if a specific favicon can't be found.
-static gfx::ImageSkia* default_icon = NULL;
+static const gfx::ImageSkia* default_icon = NULL;
 
 class ModelEntry {
  public:
@@ -46,7 +46,7 @@ class ModelEntry {
         model_(model) {
     if (!default_icon) {
       default_icon = ResourceBundle::GetSharedInstance().
-          GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
+          GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToImageSkia();
     }
   }
 
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 60ca573..1fea540 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -105,7 +105,7 @@ std::string ContentBrowserClient::GetAcceptLangs(BrowserContext* context) {
   return std::string();
 }
 
-gfx::ImageSkia* ContentBrowserClient::GetDefaultFavicon() {
+const gfx::ImageSkia* ContentBrowserClient::GetDefaultFavicon() {
   static gfx::ImageSkia* empty = new gfx::ImageSkia();
   return empty;
 }
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index b4fdc39..e9b0e88 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -300,7 +300,7 @@ class CONTENT_EXPORT ContentBrowserClient {
   virtual std::string GetAcceptLangs(BrowserContext* context);
 
   // Returns the default favicon.  The callee doesn't own the given bitmap.
-  virtual gfx::ImageSkia* GetDefaultFavicon();
+  virtual const gfx::ImageSkia* GetDefaultFavicon();
 
   // Allow the embedder to control if an AppCache can be used for the given url.
   // This is called on the IO thread.