Revert of [android] Correct the URL scheme colors in the Omnibox.

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

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 600eaa7483877b55ac815eefbf5684a65ebfd42e..92b176115fcfe30705796cfd5fb0e80354324016 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
@@ -129,8 +129,8 @@
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 4, spans.length);
-        spans[0].assertIsColoredSpan(
-                "https", 0, ApiCompatibilityUtils.getColor(mResources, R.color.google_green_700));
+        spans[0].assertIsColoredSpan("https", 0, ApiCompatibilityUtils.getColor(mResources,
+                R.color.url_emphasis_start_scheme_secure));
         spans[1].assertIsColoredSpan("://", 5, ApiCompatibilityUtils.getColor(mResources,
                 R.color.url_emphasis_non_emphasized_text));
         spans[2].assertIsColoredSpan("www.google.com", 8, ApiCompatibilityUtils.getColor(mResources,
@@ -179,8 +179,8 @@
 
         assertEquals("Unexpected number of spans:", 5, spans.length);
         spans[0].assertIsStrikethroughSpan("https", 0);
-        spans[1].assertIsColoredSpan(
-                "https", 0, ApiCompatibilityUtils.getColor(mResources, R.color.google_red_700));
+        spans[1].assertIsColoredSpan("https", 0, ApiCompatibilityUtils.getColor(mResources,
+                R.color.url_emphasis_start_scheme_security_error));
         spans[2].assertIsColoredSpan("://", 5, ApiCompatibilityUtils.getColor(mResources,
                 R.color.url_emphasis_non_emphasized_text));
         spans[3].assertIsColoredSpan("www.google.com", 8, ApiCompatibilityUtils.getColor(mResources,
@@ -203,12 +203,13 @@
                 ConnectionSecurityLevel.SECURITY_WARNING, false, true, true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
-        assertEquals("Unexpected number of spans:", 3, spans.length);
-        spans[0].assertIsColoredSpan("https", 0, ApiCompatibilityUtils.getColor(mResources,
-                                                         R.color.url_emphasis_non_emphasized_text));
-        spans[1].assertIsColoredSpan("://", 5, ApiCompatibilityUtils.getColor(mResources,
-                R.color.url_emphasis_non_emphasized_text));
-        spans[2].assertIsColoredSpan("www.dodgysite.com", 8, ApiCompatibilityUtils.getColor(
+        assertEquals("Unexpected number of spans:", 4, spans.length);
+        spans[0].assertIsStrikethroughSpan("https", 0);
+        spans[1].assertIsColoredSpan("https", 0, ApiCompatibilityUtils.getColor(mResources,
+                R.color.url_emphasis_start_scheme_security_warning));
+        spans[2].assertIsColoredSpan("://", 5, ApiCompatibilityUtils.getColor(mResources,
+                R.color.url_emphasis_non_emphasized_text));
+        spans[3].assertIsColoredSpan("www.dodgysite.com", 8, ApiCompatibilityUtils.getColor(
                 mResources, R.color.url_emphasis_domain_and_registry));
     }