chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappUrlBarTest.java - Issue 1169213006: Make ConnectionSecurityHelper a namespace instead of a class

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappUrlBarTest.java

Issue 1169213006: Make ConnectionSecurityHelper a namespace instead of a class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java_staging/src/org/chromium/chrome/browser/webapps/WebappActivity.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappVisibilityTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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();