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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1123943002: Move SecurityLevel into a class of its own (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more android build fixes Created 5 years, 7 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/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java ('k') | chrome/browser/ssl/security_level_policy.h » ('j') | chrome/browser/ssl/security_level_policy.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
index 6ce272fb76915bf96e9943686fef8bc5e7926f73..e9e3801021b87c9420bc227d3b50e071670d599c 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
+++ b/chrome/android/javatests/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.ui.toolbar.ToolbarModelSecurityLevel;
+import org.chromium.chrome.browser.ssl.SecurityLevelPolicySecurityLevel;
import org.chromium.chrome.shell.ChromeShellActivity;
import org.chromium.chrome.shell.ChromeShellTab;
import org.chromium.chrome.shell.ChromeShellTestBase;
@@ -125,9 +125,8 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
@Feature({"Browser", "Main"})
public void testShortSecureHTTPSUrl() {
Spannable url = new SpannableStringBuilder("https://www.google.com/");
- OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
- mProfile, ToolbarModelSecurityLevel.SECURE, false,
- true);
+ OmniboxUrlEmphasizer.emphasizeUrl(
+ url, mResources, mProfile, SecurityLevelPolicySecurityLevel.SECURE, false, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 4, spans.length);
@@ -150,9 +149,8 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
@Feature({"Browser", "Main"})
public void testShortSecureHTTPSUrlWithLightColors() {
Spannable url = new SpannableStringBuilder("https://www.google.com/");
- OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
- mProfile, ToolbarModelSecurityLevel.SECURE, false,
- false);
+ OmniboxUrlEmphasizer.emphasizeUrl(
+ url, mResources, mProfile, SecurityLevelPolicySecurityLevel.SECURE, false, false);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 4, spans.length);
@@ -176,9 +174,8 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
public void testLongInsecureHTTPSUrl() {
Spannable url = new SpannableStringBuilder(
"https://www.google.com/q?query=abc123&results=1");
- OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
- mProfile, ToolbarModelSecurityLevel.SECURITY_ERROR, false,
- true);
+ OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
+ SecurityLevelPolicySecurityLevel.SECURITY_ERROR, false, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 5, spans.length);
@@ -202,9 +199,8 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
@Feature({"Browser", "Main"})
public void testVeryShortWarningHTTPSUrl() {
Spannable url = new SpannableStringBuilder("https://www.dodgysite.com");
- OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
- mProfile, ToolbarModelSecurityLevel.SECURITY_WARNING, false,
- true);
+ OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
+ SecurityLevelPolicySecurityLevel.SECURITY_WARNING, false, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -225,9 +221,8 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
@Feature({"Browser", "Main"})
public void testAboutPageUrl() {
Spannable url = new SpannableStringBuilder("about:blank");
- OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
- mProfile, ToolbarModelSecurityLevel.NONE, true,
- true);
+ OmniboxUrlEmphasizer.emphasizeUrl(
+ url, mResources, mProfile, SecurityLevelPolicySecurityLevel.NONE, true, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -249,9 +244,8 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
public void testDataUrl() {
Spannable url = new SpannableStringBuilder(
"data:text/plain;charset=utf-8;base64,VGVzdCBVUkw=");
- OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
- mProfile, ToolbarModelSecurityLevel.NONE, true,
- true);
+ OmniboxUrlEmphasizer.emphasizeUrl(
+ url, mResources, mProfile, SecurityLevelPolicySecurityLevel.NONE, true, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 1, spans.length);
@@ -268,9 +262,8 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
@Feature({"Browser", "Main"})
public void testInternalChromePageUrl() {
Spannable url = new SpannableStringBuilder("chrome://bookmarks");
- OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
- mProfile, ToolbarModelSecurityLevel.NONE, true,
- true);
+ OmniboxUrlEmphasizer.emphasizeUrl(
+ url, mResources, mProfile, SecurityLevelPolicySecurityLevel.NONE, true, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -291,9 +284,8 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
@Feature({"Browser", "Main"})
public void testInternalChromeNativePageUrl() {
Spannable url = new SpannableStringBuilder("chrome-native://bookmarks");
- OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
- mProfile, ToolbarModelSecurityLevel.NONE, true,
- true);
+ OmniboxUrlEmphasizer.emphasizeUrl(
+ url, mResources, mProfile, SecurityLevelPolicySecurityLevel.NONE, true, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -314,9 +306,8 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
@Feature({"Browser", "Main"})
public void testInvalidUrl() {
Spannable url = new SpannableStringBuilder("invalidurl");
- OmniboxUrlEmphasizer.emphasizeUrl(url, mResources,
- mProfile, ToolbarModelSecurityLevel.NONE, true,
- true);
+ OmniboxUrlEmphasizer.emphasizeUrl(
+ url, mResources, mProfile, SecurityLevelPolicySecurityLevel.NONE, true, true);
EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
assertEquals("Unexpected number of spans:", 1, spans.length);
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java ('k') | chrome/browser/ssl/security_level_policy.h » ('j') | chrome/browser/ssl/security_level_policy.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698