Align size of Omnibox and Suggestion icons.

Bug: 992024, 991039
Change-Id: I3359e20a67c5a40d10a704c92525e6c7a1cc9f69
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1976799Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Commit-Queue: Ender <ender@google.com>
Cr-Commit-Position: refs/heads/master@{#726523}

chrome/android/features/tab_ui/java/res/layout/tab_grid_card_item.xml

@@ -37,7 +37,7 @@
                 android:minWidth="8dp"
                 android:adjustViewBounds="true"
                 android:importantForAccessibility="no"
-                android:src="@drawable/ic_omnibox_page"/>
+                app:srcCompat="@drawable/ic_globe_24dp"/>
             <TextView
                 android:id="@+id/tab_title"
                 android:layout_width="match_parent"

chrome/android/features/tab_ui/java/res/layout/tab_grid_message_card_item.xml

@@ -4,6 +4,7 @@
      found in the LICENSE file. -->
 <org.chromium.chrome.browser.tasks.tab_management.MessageCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/tab_grid_message_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -17,7 +18,7 @@
         android:minWidth="8dp"
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
-        android:src="@drawable/ic_omnibox_page"/>
+        app:srcCompat="@drawable/ic_globe_24dp"/>
     <org.chromium.chrome.browser.ui.widget.text.TemplatePreservingTextView
         android:id="@+id/description"
         android:layout_width="0dp"

chrome/android/java/src/org/chromium/chrome/browser/omnibox/status/StatusMediator.java

@@ -9,10 +9,12 @@ import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.text.TextUtils;
 import android.view.View;
+
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 import androidx.annotation.VisibleForTesting;
+
 import org.chromium.base.Callback;
 import org.chromium.base.MathUtils;
 import org.chromium.base.library_loader.LibraryProcessType;
@@ -459,8 +461,8 @@ class StatusMediator {
         mIsSecurityButtonShown = false;
         if (mUrlHasFocus) {
             if (mShowStatusIconWhenUrlFocused) {
-                icon = mFirstSuggestionIsSearchQuery ? R.drawable.omnibox_search
-                                                     : R.drawable.ic_omnibox_page;
+                icon = mFirstSuggestionIsSearchQuery ? R.drawable.ic_suggestion_magnifier
+                                                     : R.drawable.ic_globe_24dp;
                 tint = mNavigationIconTintRes;
             }
         } else if (mSecurityIconRes != 0) {

chrome/android/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java

@@ -369,7 +369,7 @@ public class LocationBarModel implements ToolbarDataProvider, ToolbarCommonPrope
         // If we're showing a query in the omnibox, and the security level is high enough to show
         // the search icon, return that instead of the security icon.
         if (getDisplaySearchTerms() != null) {
-                return R.drawable.omnibox_search;
+            return R.drawable.ic_suggestion_magnifier;
         }
 
         return getSecurityIconResource(getSecurityLevel(), !isTablet, isOfflinePage(), isPreview());