diff options
| -rw-r--r-- | chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/automation/automation_proxy_uitest.cc | 4 | ||||
| -rw-r--r-- | chrome/test/nacl/nacl_ui_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/ui/npapi_uitest.cc | 3 | ||||
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 3 |
5 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc index 67cbe92..86cd4c7 100644 --- a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc +++ b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc @@ -77,7 +77,7 @@ TEST_F(ResourceDispatcherTest, ContentDispositionInline) { } // Test for bug #1091358. -// Flakey due to NavigateToURL bug: see http://crbug.com/55380 +// Flaky: http://crbug.com/62595 TEST_F(ResourceDispatcherTest, FLAKY_SyncXMLHttpRequest) { net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index 513e83d..1e5b2cd 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -840,7 +840,7 @@ AutomationProxy* ExternalTabUITest::CreateAutomationProxy(int exec_timeout) { } // Create with specifying a url -// Flaky, http://crbug.com/32293. +// Flaky, http://crbug.com/32293 TEST_F(ExternalTabUITest, FLAKY_CreateExternalTab1) { scoped_refptr<TabProxy> tab; TimedMessageLoopRunner loop(MessageLoop::current()); @@ -863,6 +863,7 @@ TEST_F(ExternalTabUITest, FLAKY_CreateExternalTab1) { } // Create with empty url and then navigate +// Flaky, http://crbug.com/32293 TEST_F(ExternalTabUITest, FLAKY_CreateExternalTab2) { scoped_refptr<TabProxy> tab; TimedMessageLoopRunner loop(MessageLoop::current()); @@ -971,6 +972,7 @@ TEST_F(ExternalTabUITest, FLAKY_TabPostMessage) { loop.RunFor(action_max_timeout_ms()); } +// Flaky: http://crbug.com/62143 TEST_F(ExternalTabUITest, FLAKY_PostMessageTarget) { net::TestServer test_server( net::TestServer::TYPE_HTTP, diff --git a/chrome/test/nacl/nacl_ui_test.cc b/chrome/test/nacl/nacl_ui_test.cc index f6faf55..4104602 100644 --- a/chrome/test/nacl/nacl_ui_test.cc +++ b/chrome/test/nacl/nacl_ui_test.cc @@ -60,7 +60,7 @@ TEST_F(NaClUITest, SrpcShmTest) { RunTest(test_file, action_max_timeout_ms()); } -TEST_F(NaClUITest, FLAKY_SrpcPluginTest) { +TEST_F(NaClUITest, SrpcPluginTest) { FilePath test_file(kSrpcPluginHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } 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)); diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 7831352..4b12a13 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -629,8 +629,7 @@ TEST_F(WorkerTest, QueuedSharedWorkerShutdown) { ASSERT_TRUE(WaitForProcessCountToBe(1, max_workers_per_tab)); } -// Flaky, http://crbug.com/35221. -TEST_F(WorkerTest, FLAKY_MultipleTabsQueuedSharedWorker) { +TEST_F(WorkerTest, MultipleTabsQueuedSharedWorker) { // Tests to make sure that only one instance of queued shared workers are // started up even when those instances are on multiple tabs. int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate; |