Make search icon in omnibox results hidpi

chrome/browser/ui/omnibox/omnibox_popup_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/omnibox/omnibox_popup_model.h"
 
 #include <algorithm>
 
 #include "unicode/ubidi.h"
 
@@ skipping 175 matching lines @@
       // SetSelectedLine() will clamp to take care of the case where we deleted
       // the last item.
       // TODO(pkasting): Eventually the controller should take care of this
       // before notifying us, reducing flicker.  At that point the check for
       // deletability can move there too.
       SetSelectedLine(selected_line, false, true);
     }
   }
 }
 
-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() {
   const AutocompleteResult& result = this->result();
   selected_line_ = result.default_match() == result.end() ?
       kNoMatch : static_cast<size_t>(result.default_match() - result.begin());
   // There had better not be a nonempty result set with no default match.
   CHECK((selected_line_ != kNoMatch) || result.empty());
   manually_selected_match_.Clear();
   selected_line_state_ = NORMAL;
   // If we're going to trim the window size to no longer include the hovered
   // line, turn hover off.  Practically, this shouldn't happen, but it
   // doesn't hurt to be defensive.
   if ((hovered_line_ != kNoMatch) && (result.size() <= hovered_line_))
     SetHoveredLine(kNoMatch);
 
   view_->UpdatePopupAppearance();
 }