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

chrome/browser/browsing_data/cookies_tree_model.cc

 // 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/browsing_data/cookies_tree_model.h"
 
 #include <algorithm>
 #include <functional>
 #include <vector>
 
@@ skipping 865 matching lines @@
 CookiesTreeModel::~CookiesTreeModel() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesTreeModel, TreeModel methods (public):
 
 // TreeModel methods:
 // 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
 // default icon. The index is relative to the list of icons returned from
 // GetIcons.
 int CookiesTreeModel::GetIconIndex(ui::TreeModelNode* node) {
   CookieTreeNode* ct_node = static_cast<CookieTreeNode*>(node);
   switch (ct_node->GetDetailedInfo().node_type) {
     case CookieTreeNode::DetailedInfo::TYPE_HOST:
       return ORIGIN;
@@ skipping 433 matching lines @@
 
 void CookiesTreeModel::NotifyObserverEndBatch() {
   // Only notify the observers if this is the outermost call to EndBatch() if
   // called in a nested manner.
   if (--batch_update_ == 0) {
     FOR_EACH_OBSERVER(Observer,
                       cookies_observer_list_,
                       TreeModelEndBatch(this));
   }
 }