Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(715)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java

Issue 1169213006: Make ConnectionSecurityHelper a namespace instead of a class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/javatests_shell/src/org/chromium/chrome/browser/TabTest.java ('k') | chrome/browser/android/chrome_jni_registrar.cc » ('j') | chrome/browser/ssl/connection_security_status.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
diff --git a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
index 46a1613b43393ce71293e158f6c2323072805456..17bdc33110c92c44991d53a46b2b5560c041d4f2 100644
--- a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
+++ b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
@@ -17,7 +17,7 @@ import org.chromium.chrome.browser.omnibox.OmniboxUrlEmphasizer.UrlEmphasisColor
import org.chromium.chrome.browser.omnibox.OmniboxUrlEmphasizer.UrlEmphasisSecurityErrorSpan;
import org.chromium.chrome.browser.omnibox.OmniboxUrlEmphasizer.UrlEmphasisSpan;
import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.ssl.ConnectionSecurityHelperSecurityLevel;
+import org.chromium.chrome.browser.ssl.ConnectionSecurityStatusSecurityLevel;
import org.chromium.chrome.shell.ChromeShellActivity;
import org.chromium.chrome.shell.ChromeShellTab;
import org.chromium.chrome.shell.ChromeShellTestBase;
@@ -126,7 +126,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
public void testShortSecureHTTPSUrl() {
Spannable url = new SpannableStringBuilder("https://www.google.com/");
OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
- ConnectionSecurityHelperSecurityLevel.SECURE, false, true, true);
+ ConnectionSecurityStatusSecurityLevel.SECURE, false, true, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 4, spans.length);
@@ -150,7 +150,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
public void testShortSecureHTTPSUrlWithLightColors() {
Spannable url = new SpannableStringBuilder("https://www.google.com/");
OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
- ConnectionSecurityHelperSecurityLevel.SECURE, false, false, false);
+ ConnectionSecurityStatusSecurityLevel.SECURE, false, false, false);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 4, spans.length);
@@ -175,7 +175,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
Spannable url = new SpannableStringBuilder(
"https://www.google.com/q?query=abc123&results=1");
OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
- ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR, false, true, true);
+ ConnectionSecurityStatusSecurityLevel.SECURITY_ERROR, false, true, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 5, spans.length);
@@ -200,7 +200,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
public void testVeryShortWarningHTTPSUrl() {
Spannable url = new SpannableStringBuilder("https://www.dodgysite.com");
OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
- ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING, false, true, true);
+ ConnectionSecurityStatusSecurityLevel.SECURITY_WARNING, false, true, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -222,7 +222,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
public void testAboutPageUrl() {
Spannable url = new SpannableStringBuilder("about:blank");
OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
- ConnectionSecurityHelperSecurityLevel.NONE, true, true, true);
+ ConnectionSecurityStatusSecurityLevel.NONE, true, true, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -245,7 +245,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
Spannable url = new SpannableStringBuilder(
"data:text/plain;charset=utf-8;base64,VGVzdCBVUkw=");
OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
- ConnectionSecurityHelperSecurityLevel.NONE, true, true, true);
+ ConnectionSecurityStatusSecurityLevel.NONE, true, true, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 1, spans.length);
@@ -263,7 +263,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
public void testInternalChromePageUrl() {
Spannable url = new SpannableStringBuilder("chrome://bookmarks");
OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
- ConnectionSecurityHelperSecurityLevel.NONE, true, true, true);
+ ConnectionSecurityStatusSecurityLevel.NONE, true, true, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -285,7 +285,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
public void testInternalChromeNativePageUrl() {
Spannable url = new SpannableStringBuilder("chrome-native://bookmarks");
OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
- ConnectionSecurityHelperSecurityLevel.NONE, true, true, true);
+ ConnectionSecurityStatusSecurityLevel.NONE, true, true, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -307,7 +307,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
public void testInvalidUrl() {
Spannable url = new SpannableStringBuilder("invalidurl");
OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
- ConnectionSecurityHelperSecurityLevel.NONE, true, true, true);
+ ConnectionSecurityStatusSecurityLevel.NONE, true, true, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 1, spans.length);
« no previous file with comments | « chrome/android/javatests_shell/src/org/chromium/chrome/browser/TabTest.java ('k') | chrome/browser/android/chrome_jni_registrar.cc » ('j') | chrome/browser/ssl/connection_security_status.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698