summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-21 01:05:23 +0000
committeraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-21 01:05:23 +0000
commit59a57dca334c2b2bc52d3175ff1cf8164f7e64d4 (patch)
treeafcad3352bef5cfb6185f73c9fa7dec29c275e98
parent415f53ef5d509c8a3ea0f472f9fd6bd175129d78 (diff)
downloadchromium_src-59a57dca334c2b2bc52d3175ff1cf8164f7e64d4.zip
chromium_src-59a57dca334c2b2bc52d3175ff1cf8164f7e64d4.tar.gz
chromium_src-59a57dca334c2b2bc52d3175ff1cf8164f7e64d4.tar.bz2
Revert "Uncomment frame message flag and disable content detection tests."
This reverts commit 174113. (original review URL: https://chromiumcodereview.appspot.com/11640036 ) BUG=167022,152337,161945 Review URL: https://chromiumcodereview.appspot.com/11635057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--content/browser/android/content_startup_flags.cc5
-rw-r--r--content/public/android/javatests/src/org/chromium/content/browser/AddressDetectionTest.java20
-rw-r--r--content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java12
-rw-r--r--content/public/android/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java4
-rw-r--r--content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java16
5 files changed, 3 insertions, 54 deletions
diff --git a/content/browser/android/content_startup_flags.cc b/content/browser/android/content_startup_flags.cc
index 1d5a682..2a630cc 100644
--- a/content/browser/android/content_startup_flags.cc
+++ b/content/browser/android/content_startup_flags.cc
@@ -63,8 +63,9 @@ void SetContentCommandLineFlags(int max_render_process_count) {
parsed_command_line->AppendSwitch(switches::kEnableFixedLayout);
parsed_command_line->AppendSwitch(switches::kEnableViewport);
- parsed_command_line->AppendSwitch(
- cc::switches::kEnableCompositorFrameMessage);
+ // FIXME(aelias): Commented out due to flaky tests.
+// parsed_command_line->AppendSwitch(
+// cc::switches::kEnableCompositorFrameMessage);
}
} // namespace content
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/AddressDetectionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/AddressDetectionTest.java
index 4491e0e..fcf9a90 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/AddressDetectionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/AddressDetectionTest.java
@@ -22,12 +22,8 @@ public class AddressDetectionTest extends ContentDetectionTestBase {
return intentUrl.equals(expectedUrl);
}
- /*
@MediumTest
@Feature({"ContentDetection", "TabContents"})
- Bug 166920
- */
- @DisabledTest
public void testMultipleAddressesInText() throws Throwable {
startActivityWithTestUrl("content/content_detection/geo_address_multiple.html");
@@ -38,12 +34,8 @@ public class AddressDetectionTest extends ContentDetectionTestBase {
"76 Ninth Avenue 4th Floor New York, NY 10011"));
}
- /*
@MediumTest
@Feature({"ContentDetection", "TabContents"})
- Bug 166920
- */
- @DisabledTest
public void testSplitAddresses() throws Throwable {
startActivityWithTestUrl("content/content_detection/geo_address_split.html");
@@ -60,12 +52,8 @@ public class AddressDetectionTest extends ContentDetectionTestBase {
"1818 Library Street Suite 400, VA 20190"));
}
- /*
@MediumTest
@Feature({"ContentDetection", "TabContents"})
- Bug 166920
- */
- @DisabledTest
public void testAddressLimits() throws Throwable {
startActivityWithTestUrl("content/content_detection/geo_address_limits.html");
@@ -82,12 +70,8 @@ public class AddressDetectionTest extends ContentDetectionTestBase {
"1600 Amphitheatre Parkway Mountain View, CA 94043"));
}
- /*
@MediumTest
@Feature({"ContentDetection", "TabContents"})
- Bug 166920
- */
- @DisabledTest
public void testRealAddresses() throws Throwable {
startActivityWithTestUrl("content/content_detection/geo_address_real.html");
@@ -104,12 +88,8 @@ public class AddressDetectionTest extends ContentDetectionTestBase {
"79th Street, New York, NY, 10024-5192"));
}
- /*
@MediumTest
@Feature({"ContentDetection", "TabContents"})
- Bug 166920
- */
- @DisabledTest
public void testSpecialChars() throws Throwable {
startActivityWithTestUrl("content/content_detection/geo_address_special_chars.html");
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java
index ea3b922..a12e2a5 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java
@@ -14,12 +14,8 @@ import org.chromium.base.test.util.Feature;
*/
public class ClickListenerTest extends ContentDetectionTestBase {
- /*
@MediumTest
@Feature({"ContentDetection", "TabContents"})
- Bug 166920
- */
- @DisabledTest
public void testClickContentOnLink() throws Throwable {
startActivityWithTestUrl("content/content_detection/click_listeners.html");
@@ -28,12 +24,8 @@ public class ClickListenerTest extends ContentDetectionTestBase {
assertTrue(isCurrentTestUrl("content/content_detection/empty.html"));
}
- /*
@MediumTest
@Feature({"ContentDetection", "TabContents"})
- Bug 166920
- */
- @DisabledTest
public void testClickContentOnJSListener1() throws Throwable {
startActivityWithTestUrl("content/content_detection/click_listeners.html");
@@ -43,12 +35,8 @@ public class ClickListenerTest extends ContentDetectionTestBase {
assertTrue(isCurrentTestUrl("content/content_detection/empty.html"));
}
- /*
@MediumTest
@Feature({"ContentDetection", "TabContents"})
- Bug 166920
- */
- @DisabledTest
public void testClickContentOnJSListener2() throws Throwable {
startActivityWithTestUrl("content/content_detection/click_listeners.html");
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java
index afe48bd..f0e113a 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java
@@ -22,12 +22,8 @@ public class EmailAddressDetectionTest extends ContentDetectionTestBase {
return intentUrl.equals(expectedUrl);
}
- /*
@MediumTest
@Feature({"ContentDetection", "TabContents"})
- Bug 166920
- */
- @DisabledTest
public void testValidEmailAddresses() throws Throwable {
startActivityWithTestUrl("content/content_detection/email.html");
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
index 7d4d107..77d56ee 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.java
@@ -38,12 +38,8 @@ public class PhoneNumberDetectionTest extends ContentDetectionTestBase {
startActivityWithTestUrlAndCommandLineArgs(testUrl, cmdlineArgs);
}
- /*
@LargeTest
@Feature({"ContentDetection", "TabContents"})
- Bug 166920
- */
- @DisabledTest
public void testInternationalNumberIntents() throws Throwable {
startActivityWithTestUrl("content/content_detection/phone_international.html");
@@ -156,12 +152,8 @@ public class PhoneNumberDetectionTest extends ContentDetectionTestBase {
assertTrue(isExpectedTelephoneIntent(intentUrl, "+97144509500"));
}
- /*
@MediumTest
@Feature({"ContentDetection", "TabContents"})
- Bug 166920
- */
- @DisabledTest
public void testLocalUSNumbers() throws Throwable {
startActivityWithTestUrlAndCountryIso("content/content_detection/phone_local.html", "US");
@@ -182,12 +174,8 @@ public class PhoneNumberDetectionTest extends ContentDetectionTestBase {
assertTrue(isExpectedTelephoneIntent(intentUrl, "+31205045100"));
}
- /*
@MediumTest
@Feature({"ContentDetection", "TabContents"})
- Bug 166920
- */
- @DisabledTest
public void testLocalUKNumbers() throws Throwable {
startActivityWithTestUrlAndCountryIso("content/content_detection/phone_local.html", "GB");
@@ -208,12 +196,8 @@ public class PhoneNumberDetectionTest extends ContentDetectionTestBase {
assertTrue(isExpectedTelephoneIntent(intentUrl, "+31205045100"));
}
- /*
@MediumTest
@Feature({"ContentDetection", "TabContents"})
- Bug 166920
- */
- @DisabledTest
public void testLocalFRNumbers() throws Throwable {
startActivityWithTestUrlAndCountryIso("content/content_detection/phone_local.html", "FR");
generated by cgit v1.1 at 2025-04-01 10:33:21 +0000