| Index: chrome/test/ui/npapi_uitest.cc
|
| diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
|
| index 0fc336d9c31af71b50a14c85bd84bf11fa3f606e..d20179a57244ad0002960506ccbffd4cb8bd5f4e 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));
|
|
|