Revert of Updated the omnibox on Android to color URLs correctly

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 98f0191a22ea0577adba79efd6ec7f27518173b2..bfaf8c8faa2822398d9170fb64ebddbb6974e9f2 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
@@ -128,11 +128,11 @@
         spans[0].assertIsColoredSpan("https", 0,
                 mResources.getColor(R.color.url_emphasis_start_scheme_secure));
         spans[1].assertIsColoredSpan("://", 5,
-                mResources.getColor(R.color.url_emphasis_non_emphasized_text));
+                mResources.getColor(R.color.url_emphasis_scheme_to_domain));
         spans[2].assertIsColoredSpan("www.google.com", 8,
                 mResources.getColor(R.color.url_emphasis_domain_and_registry));
         spans[3].assertIsColoredSpan("/", 22,
-                mResources.getColor(R.color.url_emphasis_non_emphasized_text));
+                mResources.getColor(R.color.url_emphasis_trailing_url));
     }
 
     /**
@@ -153,11 +153,11 @@
         spans[0].assertIsColoredSpan("https", 0,
                 mResources.getColor(R.color.url_emphasis_start_scheme_secure));
         spans[1].assertIsColoredSpan("://", 5,
-                mResources.getColor(R.color.url_emphasis_non_emphasized_text));
+                mResources.getColor(R.color.url_emphasis_scheme_to_domain));
         spans[2].assertIsColoredSpan("www.google.com", 8,
                 mResources.getColor(R.color.url_emphasis_light_domain_and_registry));
         spans[3].assertIsColoredSpan("/", 22,
-                mResources.getColor(R.color.url_emphasis_non_emphasized_text));
+                mResources.getColor(R.color.url_emphasis_trailing_url));
     }
 
     /**
@@ -180,11 +180,11 @@
         spans[1].assertIsColoredSpan("https", 0,
                 mResources.getColor(R.color.url_emphasis_start_scheme_security_error));
         spans[2].assertIsColoredSpan("://", 5,
-                mResources.getColor(R.color.url_emphasis_non_emphasized_text));
+                mResources.getColor(R.color.url_emphasis_scheme_to_domain));
         spans[3].assertIsColoredSpan("www.google.com", 8,
                 mResources.getColor(R.color.url_emphasis_domain_and_registry));
         spans[4].assertIsColoredSpan("/q?query=abc123&results=1", 22,
-                mResources.getColor(R.color.url_emphasis_non_emphasized_text));
+                mResources.getColor(R.color.url_emphasis_trailing_url));
     }
 
     /**
@@ -205,7 +205,7 @@
         spans[0].assertIsColoredSpan("https", 0,
                 mResources.getColor(R.color.url_emphasis_start_scheme_security_warning));
         spans[1].assertIsColoredSpan("://", 5,
-                mResources.getColor(R.color.url_emphasis_non_emphasized_text));
+                mResources.getColor(R.color.url_emphasis_scheme_to_domain));
         spans[2].assertIsColoredSpan("www.dodgysite.com", 8,
                 mResources.getColor(R.color.url_emphasis_domain_and_registry));
     }
@@ -226,9 +226,9 @@
 
         assertEquals("Unexpected number of spans:", 3, spans.length);
         spans[0].assertIsColoredSpan("about", 0,
-                mResources.getColor(R.color.url_emphasis_non_emphasized_text));
+                mResources.getColor(R.color.url_emphasis_trailing_url));
         spans[1].assertIsColoredSpan(":", 5,
-                mResources.getColor(R.color.url_emphasis_non_emphasized_text));
+                mResources.getColor(R.color.url_emphasis_scheme_to_domain));
         spans[2].assertIsColoredSpan("blank", 6,
                 mResources.getColor(R.color.url_emphasis_domain_and_registry));
     }
@@ -250,7 +250,7 @@
 
         assertEquals("Unexpected number of spans:", 1, spans.length);
         spans[0].assertIsColoredSpan("data", 0,
-                mResources.getColor(R.color.url_emphasis_non_emphasized_text));
+                mResources.getColor(R.color.url_emphasis_trailing_url));
     }
 
     /**
@@ -269,9 +269,9 @@
 
         assertEquals("Unexpected number of spans:", 3, spans.length);
         spans[0].assertIsColoredSpan("chrome", 0,
-                mResources.getColor(R.color.url_emphasis_non_emphasized_text));
+                mResources.getColor(R.color.url_emphasis_scheme_to_domain));
         spans[1].assertIsColoredSpan("://", 6,
-                mResources.getColor(R.color.url_emphasis_non_emphasized_text));
+                mResources.getColor(R.color.url_emphasis_scheme_to_domain));
         spans[2].assertIsColoredSpan("bookmarks", 9,
                 mResources.getColor(R.color.url_emphasis_domain_and_registry));
     }
@@ -292,9 +292,9 @@
 
         assertEquals("Unexpected number of spans:", 3, spans.length);
         spans[0].assertIsColoredSpan("chrome-native", 0,
-                mResources.getColor(R.color.url_emphasis_non_emphasized_text));
+                mResources.getColor(R.color.url_emphasis_scheme_to_domain));
         spans[1].assertIsColoredSpan("://", 13,
-                mResources.getColor(R.color.url_emphasis_non_emphasized_text));
+                mResources.getColor(R.color.url_emphasis_scheme_to_domain));
         spans[2].assertIsColoredSpan("bookmarks", 16,
                 mResources.getColor(R.color.url_emphasis_domain_and_registry));
     }