summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-09 23:16:19 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-09 23:16:19 +0000
commit9db9173baebf27623ce30770696f84a3fec74259 (patch)
tree8326c0ac249290860fadc267e46906f5250ba3de /chrome/test/ui
parent290887cb314a84085f40e78a8dff626a077cb259 (diff)
downloadchromium_src-9db9173baebf27623ce30770696f84a3fec74259.zip
chromium_src-9db9173baebf27623ce30770696f84a3fec74259.tar.gz
chromium_src-9db9173baebf27623ce30770696f84a3fec74259.tar.bz2
Remove some obsolete FLAKY_ markers, and add some missing bug references
BUG=29020,35221,62143,62595 TEST=N/A Review URL: http://codereview.chromium.org/4759001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
-rw-r--r--chrome/test/ui/npapi_uitest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
index 0fc336d..d20179a 100644
--- a/chrome/test/ui/npapi_uitest.cc
+++ b/chrome/test/ui/npapi_uitest.cc
@@ -78,10 +78,9 @@ TEST_F(NPAPITesterBase, GetJavaScriptURL) {
kTestCompleteSuccess, action_max_timeout_ms());
}
-// Flaky test: http://crbug.com/29020
// Test that calling GetURL with a javascript URL and target=_self
// works properly when the plugin is embedded in a subframe.
-TEST_F(NPAPITesterBase, FLAKY_GetJavaScriptURL2) {
+TEST_F(NPAPITesterBase, GetJavaScriptURL2) {
const FilePath test_case(FILE_PATH_LITERAL("get_javascript_url2.html"));
GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));