summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_encoding_uitest.cc
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-25 22:19:33 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-25 22:19:33 +0000
commit3f0a911193b03801a6456126306e36bd58d8397a (patch)
tree57283a7de5a903f7392d2cd1b9dc1168682ba36f /chrome/browser/browser_encoding_uitest.cc
parent4e6d999a7d302b751871d23308e9174ec3b8805c (diff)
downloadchromium_src-3f0a911193b03801a6456126306e36bd58d8397a.zip
chromium_src-3f0a911193b03801a6456126306e36bd58d8397a.tar.gz
chromium_src-3f0a911193b03801a6456126306e36bd58d8397a.tar.bz2
Disable TestOverrideEncoding test. It's been hanging the XP Tests (dbg)(3) ui_test all day.
BUG=23121 TEST=none TBR=jnd Review URL: http://codereview.chromium.org/252007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_encoding_uitest.cc')
-rw-r--r--chrome/browser/browser_encoding_uitest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc
index acbb8ee..d048efd 100644
--- a/chrome/browser/browser_encoding_uitest.cc
+++ b/chrome/browser/browser_encoding_uitest.cc
@@ -115,7 +115,7 @@ TEST_F(BrowserEncodingTest, TestEncodingAliasMapping) {
// We are disabling this test on MacOS and Linux because on those platforms
// AutomationProvider::OverrideEncoding is not implemented yet.
// TODO(port): Enable when encoding-related parts of Browser are ported.
-TEST_F(BrowserEncodingTest, TestOverrideEncoding) {
+TEST_F(BrowserEncodingTest, DISABLED_TestOverrideEncoding) {
const char* const kTestFileName = "gb18030_with_iso88591_meta.html";
const char* const kExpectedFileName =
"expected_gb18030_saved_from_iso88591_meta.html";