summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_encoding_uitest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-29 09:53:58 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-29 09:53:58 +0000
commitee4461f9b3d9f31f1ef203400e6baa395731f360 (patch)
treedc137b5319428e1b3859c1ef2a5a497fa9e94bae /chrome/browser/browser_encoding_uitest.cc
parent63b39c73dd951416f6c1808f34a10ca422336610 (diff)
downloadchromium_src-ee4461f9b3d9f31f1ef203400e6baa395731f360.zip
chromium_src-ee4461f9b3d9f31f1ef203400e6baa395731f360.tar.gz
chromium_src-ee4461f9b3d9f31f1ef203400e6baa395731f360.tar.bz2
GTTF: remove flaky mark from following tests:
- FilePathWatcherTest.DeleteAndRecreate (bug 54822) - FilePathWatcherTest.DirectoryChain (bug 54822) - FilePathWatcherTest.MoveChild (bug 54822) - FilePathWatcherTest.MoveParent (bug 54822) - FilePathWatcherTest.NonExistentDirectory (bug 54822) - AccountScreenTest.TestSchemeInspector (bug 46274) - SavePageBrowserTest.SaveCompleteHTML (bug 52292) - DownloadRequestLimiterTest.Allow (bug 39753) - PPAPITest.Graphics2D (bug 54150) - ExtensionApiTest.Storage (bug 42943) - BrowserEncodingTest.TestEncodingAliasMapping (bug 51716) - BrowserCrApplicationAppleScriptTest.InsertWindow (bug 53584) - ExtensionInstallUIBrowserTest.TestThemeInstallUndoResetsToDefault (bug 43441) TBR=mal BUG=54822, 46274, 52292, 39753, 54150, 42943, 51716, 53584, 43441 TEST=none Review URL: http://codereview.chromium.org/3545003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60923 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, 1 insertions, 2 deletions
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc
index e232c5e..1b52a3d 100644
--- a/chrome/browser/browser_encoding_uitest.cc
+++ b/chrome/browser/browser_encoding_uitest.cc
@@ -52,8 +52,7 @@ 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.
-// Marked as flaky: http://crbug.com/51716
-TEST_F(BrowserEncodingTest, FLAKY_TestEncodingAliasMapping) {
+TEST_F(BrowserEncodingTest, TestEncodingAliasMapping) {
struct EncodingTestData {
const char* file_name;
const char* encoding_name;