Make some updates to extension iconography.

chrome/browser/ui/omnibox/chrome_omnibox_client.cc

 // Copyright 2013 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/chrome_omnibox_client.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 30 matching lines @@
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "components/omnibox/browser/search_provider.h"
 #include "components/prefs/pref_service.h"
 #include "components/search/search.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/constants.h"
+#include "third_party/skia/include/core/SkBitmap.h"

[Peter Kasting, 2016/12/15 07:54:26]

Nit: Is this an IWYU change?

[Evan Stade, 2016/12/15 23:49:02]

more or less. It was relying on a transitive include.

 #include "ui/base/window_open_disposition.h"
 #include "url/gurl.h"
 
 using predictors::AutocompleteActionPredictor;
 
 namespace {
 
 // Returns the AutocompleteMatch that the InstantController should prefetch, if
 // any.
 //
@@ skipping 146 matching lines @@
   return AutocompleteClassifierFactory::GetForProfile(profile_);
 }
 
 gfx::Image ChromeOmniboxClient::GetIconIfExtensionMatch(
     const AutocompleteMatch& match) const {
   TemplateURLService* service =
       TemplateURLServiceFactory::GetForProfile(profile_);
   const TemplateURL* template_url = match.GetTemplateURL(service, false);
   if (template_url &&
       (template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION)) {
-    return extensions::OmniboxAPI::Get(profile_)
-        ->GetOmniboxPopupIcon(template_url->GetExtensionId());
+    return extensions::OmniboxAPI::Get(profile_)->GetOmniboxIcon(
+        template_url->GetExtensionId());
   }
   return gfx::Image();
 }
 
 bool ChromeOmniboxClient::ProcessExtensionKeyword(
     TemplateURL* template_url,
     const AutocompleteMatch& match,
     WindowOpenDisposition disposition,
     OmniboxNavigationObserver* observer) {
   if (template_url->type() != TemplateURL::OMNIBOX_API_EXTENSION)
@@ skipping 223 matching lines @@
       InstantSearchPrerenderer::GetForProfile(profile_);
   if (prerenderer)
     prerenderer->Prerender(suggestion);
 }
 
 void ChromeOmniboxClient::OnBitmapFetched(const BitmapFetchedCallback& callback,
                                           const SkBitmap& bitmap) {
   request_id_ = BitmapFetcherService::REQUEST_ID_INVALID;
   callback.Run(bitmap);
 }