Fix location bar icon size/color

Fix swapping argument to FromVectorIcon() in location bar.

Bug: 1123344
Change-Id: Ib2ddcd50b5095d349f9d996f750e9b61f6c52860
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2385478Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803113}

chrome/browser/ui/views/location_bar/custom_tab_bar_view.cc

@@ -437,8 +437,8 @@ ui::ImageModel CustomTabBarView::GetLocationIcon(
     LocationIconView::Delegate::IconFetchedCallback on_icon_fetched) const {
   return ui::ImageModel::FromVectorIcon(
       delegate_->GetLocationBarModel()->GetVectorIcon(),
-      GetLayoutConstant(LOCATION_BAR_ICON_SIZE),
-      GetSecurityChipColor(GetLocationBarModel()->GetSecurityLevel()));
+      GetSecurityChipColor(GetLocationBarModel()->GetSecurityLevel()),
+      GetLayoutConstant(LOCATION_BAR_ICON_SIZE));
 }
 
 void CustomTabBarView::ButtonPressed(views::Button* sender,

chrome/browser/ui/views/location_bar/permission_chip.cc

@@ -239,8 +239,8 @@ void PermissionChip::UpdatePermissionIconAndTextColor() {
   chip_button_->SetEnabledTextColors(enabled_text_color);
   chip_button_->SetImageModel(
       views::Button::STATE_NORMAL,
-      ui::ImageModel::FromVectorIcon(GetPermissionIconId(), GetIconSize(),
-                                     enabled_text_color));
+      ui::ImageModel::FromVectorIcon(GetPermissionIconId(), enabled_text_color,
+                                     GetIconSize()));
 }
 
 const gfx::VectorIcon& PermissionChip::GetPermissionIconId() {

chrome/browser/ui/views/location_bar/selected_keyword_view.cc

@@ -55,8 +55,8 @@ void SelectedKeywordView::SetCustomImage(const gfx::Image& image) {
     IconLabelBubbleView::SetImageModel(ui::ImageModel::FromImage(image));
   } else {
     IconLabelBubbleView::SetImageModel(ui::ImageModel::FromVectorIcon(
-        vector_icons::kSearchIcon, GetLayoutConstant(LOCATION_BAR_ICON_SIZE),
-        GetForegroundColor()));
+        vector_icons::kSearchIcon, GetForegroundColor(),
+        GetLayoutConstant(LOCATION_BAR_ICON_SIZE)));
   }
 }