summaryrefslogtreecommitdiffstats
path: root/chrome/test/page_cycler
diff options
context:
space:
mode:
authorchase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-03 19:14:12 +0000
committerchase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-03 19:14:12 +0000
commit0c6f592772d378aaef217fad2d22edc3f69699bc (patch)
treee280e0c56f3a4f15b83d63f94d3b4a8dd1fede27 /chrome/test/page_cycler
parentb6f3cf1e86be71f6499c74f9fbe5cda571f56fd5 (diff)
downloadchromium_src-0c6f592772d378aaef217fad2d22edc3f69699bc.zip
chromium_src-0c6f592772d378aaef217fad2d22edc3f69699bc.tar.gz
chromium_src-0c6f592772d378aaef217fad2d22edc3f69699bc.tar.bz2
Re-enable moz-http page cycler.
Reverts r40097. BUG=36871 TEST=page_cycler_moz-http is green Review URL: http://codereview.chromium.org/661449 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/page_cycler')
-rw-r--r--chrome/test/page_cycler/page_cycler_test.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc
index 6d5d1af..6750b08 100644
--- a/chrome/test/page_cycler/page_cycler_test.cc
+++ b/chrome/test/page_cycler/page_cycler_test.cc
@@ -458,8 +458,7 @@ PAGE_CYCLER_FILE_TESTS("morejs", MorejsFile);
PAGE_CYCLER_EXTENSIONS_FILE_TESTS("morejs", MorejsFile);
// http (localhost) tests
-// This test is disabled. See bug 36871.
-// PAGE_CYCLER_HTTP_TESTS("moz", MozHttp);
+PAGE_CYCLER_HTTP_TESTS("moz", MozHttp);
PAGE_CYCLER_HTTP_TESTS("intl1", Intl1Http);
PAGE_CYCLER_HTTP_TESTS("intl2", Intl2Http);
PAGE_CYCLER_HTTP_TESTS("dom", DomHttp);