| Index: chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappUrlBarTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappUrlBarTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappUrlBarTest.java
|
| index cf228680a2fd30b596a8b5e730e5015ddfafccd8..814516e254c39c6dd5d2cbc94727336997e135a9 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappUrlBarTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappUrlBarTest.java
|
| @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.webapps;
|
|
|
| import android.test.FlakyTest;
|
|
|
| -import org.chromium.chrome.browser.ssl.ConnectionSecurityHelperSecurityLevel;
|
| +import org.chromium.chrome.browser.ssl.ConnectionSecurityLevel;
|
| import org.chromium.content_public.common.ScreenOrientationValues;
|
|
|
| /**
|
| @@ -40,17 +40,15 @@ public class WebappUrlBarTest extends WebappActivityTestBase {
|
| final String url = scheme + host + path;
|
| final String urlExpectedWhenIconNotShown = scheme + host;
|
| final String urlExpectedWhenIconShown = host;
|
| - final int[] securityLevels = {
|
| - ConnectionSecurityHelperSecurityLevel.NONE,
|
| - ConnectionSecurityHelperSecurityLevel.EV_SECURE,
|
| - ConnectionSecurityHelperSecurityLevel.SECURE,
|
| - ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING,
|
| - ConnectionSecurityHelperSecurityLevel.SECURITY_POLICY_WARNING,
|
| - ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR };
|
| + final int[] securityLevels = {ConnectionSecurityLevel.NONE,
|
| + ConnectionSecurityLevel.EV_SECURE, ConnectionSecurityLevel.SECURE,
|
| + ConnectionSecurityLevel.SECURITY_WARNING,
|
| + ConnectionSecurityLevel.SECURITY_POLICY_WARNING,
|
| + ConnectionSecurityLevel.SECURITY_ERROR};
|
|
|
| for (int i : securityLevels) {
|
| // http://crbug.com/297249
|
| - if (i == ConnectionSecurityHelperSecurityLevel.SECURITY_POLICY_WARNING) continue;
|
| + if (i == ConnectionSecurityLevel.SECURITY_POLICY_WARNING) continue;
|
| mUrlBar.update(url, i);
|
|
|
| int iconResource = mUrlBar.getCurrentIconResourceForTests();
|
|
|