2 files changed, 12 insertions, 7 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_popup_model.cc b/chrome/browser/ui/omnibox/omnibox_popup_model.cc
index 6492eb9..467a903 100644
--- a/chrome/browser/ui/omnibox/omnibox_popup_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_popup_model.cc
@@ -193,13 +193,15 @@ void OmniboxPopupModel::TryDeletingCurrentItem() {
   }
 }
 
-const SkBitmap* OmniboxPopupModel::GetIconIfExtensionMatch(
+gfx::Image OmniboxPopupModel::GetIconIfExtensionMatch(
     const AutocompleteMatch& match) const {
   Profile* profile = edit_model_->profile();
   const TemplateURL* template_url = match.GetTemplateURL(profile);
-  return (template_url && template_url->IsExtensionKeyword()) ?
-      &profile->GetExtensionService()->GetOmniboxPopupIcon(
-          template_url->GetExtensionId()) : NULL;
+  if (template_url && template_url->IsExtensionKeyword()) {
+    return profile->GetExtensionService()->GetOmniboxPopupIcon(
+        template_url->GetExtensionId());
+  }
+  return gfx::Image();
 }
 
 void OmniboxPopupModel::OnResultChanged() {
diff --git a/chrome/browser/ui/omnibox/omnibox_popup_model.h b/chrome/browser/ui/omnibox/omnibox_popup_model.h
index f4b4b23..85934b4 100644
--- a/chrome/browser/ui/omnibox/omnibox_popup_model.h
+++ b/chrome/browser/ui/omnibox/omnibox_popup_model.h
@@ -11,7 +11,10 @@
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 
 class OmniboxPopupView;
-class SkBitmap;
+
+namespace gfx {
+class Image;
+}
 
 class OmniboxPopupModel {
  public:
@@ -81,8 +84,8 @@ class OmniboxPopupModel {
   void TryDeletingCurrentItem();
 
   // If |match| is from an extension, returns the extension icon; otherwise
-  // returns NULL.
-  const SkBitmap* GetIconIfExtensionMatch(const AutocompleteMatch& match) const;
+  // returns an empty Image.
+  gfx::Image GetIconIfExtensionMatch(const AutocompleteMatch& match) const;
 
   // The match the user has manually chosen, if any.
   const AutocompleteResult::Selection& manually_selected_match() const {