Fix omnibox icon size/color.

Bug: 1123344, 1123345
Change-Id: Id0433c3defeadc07aaf35d81de1b37f965e0d8aa
Tbr: jdonnelly
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2385240
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803114}

components/omnibox/browser/omnibox_view.cc

@@ -178,13 +178,13 @@ ui::ImageModel OmniboxView::GetIcon(int dip_size,
     AutocompleteMatch fake_match;
     fake_match.type = AutocompleteMatchType::URL_WHAT_YOU_TYPED;
     const gfx::VectorIcon& vector_icon = fake_match.GetVectorIcon(false);
-    return ui::ImageModel::FromVectorIcon(vector_icon, dip_size, color);
+    return ui::ImageModel::FromVectorIcon(vector_icon, color, dip_size);
   }
 
   if (model_->ShouldShowCurrentPageIcon()) {
     LocationBarModel* location_bar_model = controller_->GetLocationBarModel();
     return ui::ImageModel::FromVectorIcon(location_bar_model->GetVectorIcon(),
-                                          dip_size, color);
+                                          color, dip_size);
   }
 
   gfx::Image favicon;
@@ -214,7 +214,7 @@ ui::ImageModel OmniboxView::GetIcon(int dip_size,
 
   const gfx::VectorIcon& vector_icon = match.GetVectorIcon(is_bookmarked);
 
-  return ui::ImageModel::FromVectorIcon(vector_icon, dip_size, color);
+  return ui::ImageModel::FromVectorIcon(vector_icon, color, dip_size);
 #endif  // defined(OS_ANDROID) || defined(OS_IOS)
 }
 

components/omnibox/browser/omnibox_view_unittest.cc

@@ -169,7 +169,7 @@ TEST_F(OmniboxViewTest, SanitizeTextForPaste) {
 // query.
 TEST_F(OmniboxViewTest, GetIcon_Default) {
   ui::ImageModel expected_icon = ui::ImageModel::FromVectorIcon(
-      vector_icons::kSearchIcon, gfx::kFaviconSize, gfx::kPlaceholderColor);
+      vector_icons::kSearchIcon, gfx::kPlaceholderColor, gfx::kFaviconSize);
 
   ui::ImageModel icon = view()->GetIcon(
       gfx::kFaviconSize, gfx::kPlaceholderColor, base::DoNothing());
@@ -189,7 +189,7 @@ TEST_F(OmniboxViewTest, GetIcon_BookmarkIcon) {
                            base::ASCIIToUTF16("a bookmark"), kUrl);
 
   ui::ImageModel expected_icon = ui::ImageModel::FromVectorIcon(
-      omnibox::kBookmarkIcon, gfx::kFaviconSize, gfx::kPlaceholderColor);
+      omnibox::kBookmarkIcon, gfx::kPlaceholderColor, gfx::kFaviconSize);
 
   ui::ImageModel icon = view()->GetIcon(
       gfx::kFaviconSize, gfx::kPlaceholderColor, base::DoNothing());