summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_encoding_uitest.cc
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-10 20:27:27 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-10 20:27:27 +0000
commit466640fc7b8e220830e974fbb805019ddd028fe5 (patch)
tree009a28956fda81b7eae8de3e5a722561f1d5d264 /chrome/browser/browser_encoding_uitest.cc
parente8c0e678989b2da302b5c64e69313fea02d42561 (diff)
downloadchromium_src-466640fc7b8e220830e974fbb805019ddd028fe5.zip
chromium_src-466640fc7b8e220830e974fbb805019ddd028fe5.tar.gz
chromium_src-466640fc7b8e220830e974fbb805019ddd028fe5.tar.bz2
Marking BrowserEncodingTest.TestEncodingAliasMapping as flaky.
BUG=51716 TEST=none Review URL: http://codereview.chromium.org/3122007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_encoding_uitest.cc')
-rw-r--r--chrome/browser/browser_encoding_uitest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc
index b6c7496..ac3ac5d 100644
--- a/chrome/browser/browser_encoding_uitest.cc
+++ b/chrome/browser/browser_encoding_uitest.cc
@@ -52,7 +52,8 @@ class BrowserEncodingTest : public UITest {
// 2. Add more files with multiple encoding name variants for each canonical
// encoding name). Webkit layout tests cover some, but testing in the UI test is
// also necessary.
-TEST_F(BrowserEncodingTest, TestEncodingAliasMapping) {
+// Marked as flaky: http://crbug.com/51716
+TEST_F(BrowserEncodingTest, FLAKY_TestEncodingAliasMapping) {
struct EncodingTestData {
const char* file_name;
const char* encoding_name;