[ExpandablePaymentHandler] Improve Security Icon

Before change:
* Security icon is not updated on new navigation until visible security
state has changed.
* if Connection Security Level is NONE, set an omnibox_info icon
* if Connection Security Level is WARNING, set omnibox_info icon

After change:
* Security icon is cleared once PH page starts new navigation.
* if Connection Security Level is NONE and the device has a small
screen, set an empty icon
* if Connection Security Level is WARNING, whether to show a
"not secure" icon or an "info" icon depends on
SecurityStateModel.shouldShowDangerTriangleForWarningLevel().

Change:
Remove the custom Security Level-Icon mapping logic; replace it with
SecurityStatusIcon.getSecurityIconResource() which is used by the
browser toolbar.

Bug: 1052133

Change-Id: I5347e1040cd2ceae99192977dc41e2d089a4e27e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2058910Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Commit-Queue: Liquan (Max) Gu <maxlg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742839}

chrome/android/java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarCoordinator.java

@@ -12,6 +12,7 @@ import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
 import org.chromium.chrome.browser.page_info.PageInfoController;
 import org.chromium.components.security_state.ConnectionSecurityLevel;
 import org.chromium.content_public.browser.WebContents;
+import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.modelutil.PropertyModel;
 import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
 import org.chromium.url.URI;
@@ -66,8 +67,9 @@ public class PaymentHandlerToolbarCoordinator {
                                               ConnectionSecurityLevel.NONE)
                                       .with(PaymentHandlerToolbarProperties.URL, url)
                                       .build();
+        boolean isSmallDevice = !DeviceFormFactor.isNonMultiDisplayContextOnTablet(context);
         PaymentHandlerToolbarMediator mediator =
-                new PaymentHandlerToolbarMediator(model, webContents, observer);
+                new PaymentHandlerToolbarMediator(model, webContents, observer, isSmallDevice);
         webContents.addObserver(mediator);
         PropertyModelChangeProcessor changeProcessor = PropertyModelChangeProcessor.create(
                 model, mToolbarView, PaymentHandlerToolbarViewBinder::bind);

chrome/android/java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediator.java

@@ -8,9 +8,9 @@ import android.os.Handler;
 import android.support.annotation.DrawableRes;
 
 import org.chromium.base.Log;
-import org.chromium.chrome.R;
 import org.chromium.chrome.browser.payments.handler.toolbar.PaymentHandlerToolbarCoordinator.PaymentHandlerToolbarObserver;
 import org.chromium.chrome.browser.ssl.SecurityStateModel;
+import org.chromium.components.omnibox.SecurityStatusIcon;
 import org.chromium.components.security_state.ConnectionSecurityLevel;
 import org.chromium.content_public.browser.NavigationHandle;
 import org.chromium.content_public.browser.WebContents;
@@ -41,6 +41,7 @@ import java.net.URISyntaxException;
     private Handler mHideProgressBarHandler;
     /** Postfixed with "Ref" to distinguish from mWebContent in WebContentsObserver. */
     private final WebContents mWebContentsRef;
+    private final boolean mIsSmallDevice;
 
     /**
      * Build a new mediator that handle events from outside the payment handler toolbar component.
@@ -48,10 +49,12 @@ import java.net.URISyntaxException;
      *         the payment handler toolbar component.
      * @param webContents The web-contents that loads the payment app.
      * @param observer The observer of this toolbar.
+     * @param isSmallDevice Whether the device screen is considered small.
      */
-    /* package */ PaymentHandlerToolbarMediator(
-            PropertyModel model, WebContents webContents, PaymentHandlerToolbarObserver observer) {
+    /* package */ PaymentHandlerToolbarMediator(PropertyModel model, WebContents webContents,
+            PaymentHandlerToolbarObserver observer, boolean isSmallDevice) {
         super(webContents);
+        mIsSmallDevice = isSmallDevice;
         mWebContentsRef = webContents;
         mModel = model;
         mObserver = observer;
@@ -91,6 +94,8 @@ import java.net.URISyntaxException;
             Log.e(TAG, "Failed to instantiate a URI with the url \"%s\".", url);
             mObserver.onToolbarError();
         }
+        mModel.set(PaymentHandlerToolbarProperties.SECURITY_ICON,
+                getSecurityIconResource(ConnectionSecurityLevel.NONE));
     }
 
     @Override
@@ -114,21 +119,10 @@ import java.net.URISyntaxException;
     }
 
     @DrawableRes
-    private static int getSecurityIconResource(@ConnectionSecurityLevel int securityLevel) {
-        switch (securityLevel) {
-            case ConnectionSecurityLevel.NONE:
-            case ConnectionSecurityLevel.WARNING:
-                return R.drawable.omnibox_info;
-            case ConnectionSecurityLevel.DANGEROUS:
-                return R.drawable.omnibox_not_secure_warning;
-            case ConnectionSecurityLevel.SECURE_WITH_POLICY_INSTALLED_CERT:
-            case ConnectionSecurityLevel.SECURE:
-            case ConnectionSecurityLevel.EV_SECURE:
-                return R.drawable.omnibox_https_valid;
-            default:
-                assert false;
-        }
-        return 0;
+    private int getSecurityIconResource(@ConnectionSecurityLevel int securityLevel) {
+        return SecurityStatusIcon.getSecurityIconResource(securityLevel,
+                SecurityStateModel.shouldShowDangerTriangleForWarningLevel(), mIsSmallDevice,
+                /*skipIconForNeutralState=*/true);
     }
 
     @Override