Disable content intent detectors in the renderer

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
index 8fdc9c3fb19fa7cc66c02856289846e82c866fcb..d7a739c3ad54a4f291ab7b92a8d3a51419dabb2c 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
@@ -1015,19 +1015,22 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView"})
+    @CommandLineFlags.Add({ContentSwitches.ENABLE_CONTENT_INTENT_DETECTION})
     public void testNullContentsClientClickableEmail() throws Throwable {
         doTestNullContentsClientClickableContent(TEST_EMAIL, TEST_EMAIL_URI);
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
-    @CommandLineFlags.Add({ContentSwitches.NETWORK_COUNTRY_ISO + "=us"})
+    @CommandLineFlags.Add({ContentSwitches.NETWORK_COUNTRY_ISO + "=us",
+            ContentSwitches.ENABLE_CONTENT_INTENT_DETECTION})
     public void testNullContentsClientClickablePhone() throws Throwable {
         doTestNullContentsClientClickableContent(TEST_PHONE, TEST_PHONE_URI);
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
+    @CommandLineFlags.Add({ContentSwitches.ENABLE_CONTENT_INTENT_DETECTION})
     public void testNullContentsClientClickableAddress() throws Throwable {
         doTestNullContentsClientClickableContent(TEST_ADDRESS, TEST_ADDRESS_URI);
     }
@@ -1049,38 +1052,44 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView"})
+    @CommandLineFlags.Add({ContentSwitches.ENABLE_CONTENT_INTENT_DETECTION})
     public void testClickableEmail() throws Throwable {
         doTestClickableContent(TEST_EMAIL, TEST_EMAIL_URI, true);
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
-    @CommandLineFlags.Add({ContentSwitches.NETWORK_COUNTRY_ISO + "=us"})
+    @CommandLineFlags.Add({ContentSwitches.NETWORK_COUNTRY_ISO + "=us",
+            ContentSwitches.ENABLE_CONTENT_INTENT_DETECTION})
     public void testClickablePhone() throws Throwable {
         doTestClickableContent(TEST_PHONE, TEST_PHONE_URI, true);
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
+    @CommandLineFlags.Add({ContentSwitches.ENABLE_CONTENT_INTENT_DETECTION})
     public void testClickableAddress() throws Throwable {
         doTestClickableContent(TEST_ADDRESS, TEST_ADDRESS_URI, true);
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
+    @CommandLineFlags.Add({ContentSwitches.ENABLE_CONTENT_INTENT_DETECTION})
     public void testClickableEmailInIframe() throws Throwable {
         doTestClickableContent(TEST_EMAIL, TEST_EMAIL_URI, false);
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
-    @CommandLineFlags.Add({ContentSwitches.NETWORK_COUNTRY_ISO + "=us"})
+    @CommandLineFlags.Add({ContentSwitches.NETWORK_COUNTRY_ISO + "=us",
+            ContentSwitches.ENABLE_CONTENT_INTENT_DETECTION})
     public void testClickablePhoneInIframe() throws Throwable {
         doTestClickableContent(TEST_PHONE, TEST_PHONE_URI, false);
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
+    @CommandLineFlags.Add({ContentSwitches.ENABLE_CONTENT_INTENT_DETECTION})
     public void testClickableAddressInIframe() throws Throwable {
         doTestClickableContent(TEST_ADDRESS, TEST_ADDRESS_URI, false);
     }