BASELINE: Update Chromium to 57.0.2987.144

Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

1 files changed, 1 insertions, 22 deletions

diff --git a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index 5212b3588e7..d954ed0be43 100644
--- a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -45,17 +45,6 @@ const char kBackgroundTabDisposition[] = "newBackgroundTab";
 // Pref key for omnibox.setDefaultSuggestion.
 const char kOmniboxDefaultSuggestion[] = "omnibox_default_suggestion";
 
-#if defined(OS_LINUX)
-static const int kOmniboxIconPaddingLeft = 2;
-static const int kOmniboxIconPaddingRight = 2;
-#elif defined(OS_MACOSX)
-static const int kOmniboxIconPaddingLeft = 0;
-static const int kOmniboxIconPaddingRight = 2;
-#else
-static const int kOmniboxIconPaddingLeft = 0;
-static const int kOmniboxIconPaddingRight = 0;
-#endif
-
 std::unique_ptr<omnibox::SuggestResult> GetOmniboxDefaultSuggestion(
     Profile* profile,
     const std::string& extension_id) {
@@ -195,10 +184,7 @@ OmniboxAPI::OmniboxAPI(content::BrowserContext* context)
   }
 
   // Use monochrome icons for Omnibox icons.
-  omnibox_popup_icon_manager_.set_monochrome(true);
   omnibox_icon_manager_.set_monochrome(true);
-  omnibox_icon_manager_.set_padding(gfx::Insets(0, kOmniboxIconPaddingLeft,
-                                                0, kOmniboxIconPaddingRight));
 }
 
 void OmniboxAPI::Shutdown() {
@@ -226,7 +212,6 @@ void OmniboxAPI::OnExtensionLoaded(content::BrowserContext* browser_context,
   const std::string& keyword = OmniboxInfo::GetKeyword(extension);
   if (!keyword.empty()) {
     // Load the omnibox icon so it will be ready to display in the URL bar.
-    omnibox_popup_icon_manager_.LoadIcon(profile_, extension);
     omnibox_icon_manager_.LoadIcon(profile_, extension);
 
     if (url_service_) {
@@ -256,13 +241,7 @@ void OmniboxAPI::OnExtensionUnloaded(content::BrowserContext* browser_context,
 }
 
 gfx::Image OmniboxAPI::GetOmniboxIcon(const std::string& extension_id) {
-  return gfx::Image::CreateFrom1xBitmap(
-      omnibox_icon_manager_.GetIcon(extension_id));
-}
-
-gfx::Image OmniboxAPI::GetOmniboxPopupIcon(const std::string& extension_id) {
-  return gfx::Image::CreateFrom1xBitmap(
-      omnibox_popup_icon_manager_.GetIcon(extension_id));
+  return omnibox_icon_manager_.GetIcon(extension_id);
 }
 
 void OmniboxAPI::OnTemplateURLsLoaded() {