summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/tests
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/tests')
-rw-r--r--chrome/browser/ui/tests/browser_uitest.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/ui/tests/browser_uitest.cc b/chrome/browser/ui/tests/browser_uitest.cc
index fdf169b..3b1ae37 100644
--- a/chrome/browser/ui/tests/browser_uitest.cc
+++ b/chrome/browser/ui/tests/browser_uitest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -76,9 +76,7 @@ class ShowModalDialogTest : public UITest {
}
};
-// Flakiness returned. Re-opened crbug.com/17806
-// TODO(estade): remove flaky label if prospective fix works.
-TEST_F(ShowModalDialogTest, FLAKY_BasicTest) {
+TEST_F(ShowModalDialogTest, BasicTest) {
FilePath test_file(test_data_directory_);
test_file = test_file.AppendASCII("showmodaldialog.html");