Disable content intent detectors in the renderer

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.annotation.SuppressLint;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Pair;
 
@@ skipping 997 matching lines @@
             });
             assertEquals(intentContent,
                     getActivity().getLastSentIntent().getData().toString());
         } finally {
             getActivity().setIgnoreStartActivity(false);
         }
     }
 
     @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);
     }
 
     private void doTestClickableContent(String pageContent, String intentContent,
             boolean inMainFrame) throws Throwable {
         standardSetup();
 
         final String findContentJs = setupForContentClickTest(pageContent, inMainFrame);
         int callCount = mShouldOverrideUrlLoadingHelper.getCallCount();
         DOMUtils.clickNodeByJs(this, mAwContents.getContentViewCore(), findContentJs);
         mShouldOverrideUrlLoadingHelper.waitForCallback(callCount);
         assertEquals(intentContent,
                 mShouldOverrideUrlLoadingHelper.getShouldOverrideUrlLoadingUrl());
         assertFalse(mShouldOverrideUrlLoadingHelper.isRedirect());
         assertTrue(mShouldOverrideUrlLoadingHelper.hasUserGesture());
         assertEquals(inMainFrame, mShouldOverrideUrlLoadingHelper.isMainFrame());
     }
 
     @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);
     }
 }