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

chrome/browser/ui/search_engines/template_url_table_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/ui/search_engines/template_url_table_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util.h"
@@ skipping 18 matching lines @@
 static const int kMainGroupID = 0;
 static const int kOtherGroupID = 1;
 static const int kExtensionGroupID = 2;
 
 // ModelEntry ----------------------------------------------------
 
 // ModelEntry wraps a TemplateURL as returned from the TemplateURL.
 // 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:
   ModelEntry(TemplateURLTableModel* model, TemplateURL* template_url)
       : template_url_(template_url),
         load_state_(NOT_LOADED),
         model_(model) {
     if (!default_icon) {
       default_icon = ResourceBundle::GetSharedInstance().
-          GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
+          GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToImageSkia();
     }
   }
 
   TemplateURL* template_url() {
     return template_url_;
   }
 
   gfx::ImageSkia GetIcon() {
     if (load_state_ == NOT_LOADED)
       LoadFavicon();
@@ skipping 331 matching lines @@
   return entry.Pass();
 }
 
 void TemplateURLTableModel::AddEntry(int index, scoped_ptr<ModelEntry> entry) {
   entries_.insert(entries_.begin() + index, entry.release());
   if (index <= last_other_engine_index_)
     ++last_other_engine_index_;
   if (observer_)
     observer_->OnItemsAdded(index, 1);
 }