Commit e0e63180 authored by jam@chromium.org's avatar jam@chromium.org

Try renabling the the disabled worker tests, now that they run in content_browsertests.

BUG=36555,69881,48148
Review URL: https://chromiumcodereview.appspot.com/10824022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148582 0039d316-1c4b-4281-b951-d872f2087c98
parent ae5f1719
...@@ -42,7 +42,7 @@ class WorkerLayoutTest : public InProcessBrowserLayoutTest { ...@@ -42,7 +42,7 @@ class WorkerLayoutTest : public InProcessBrowserLayoutTest {
// Crashy, http://crbug.com/35965. // Crashy, http://crbug.com/35965.
// Flaky, http://crbug.com/36555. // Flaky, http://crbug.com/36555.
IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, DISABLED_WorkerClonePort) { IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, WorkerClonePort) {
RunLayoutTest("worker-cloneport.html"); RunLayoutTest("worker-cloneport.html");
} }
...@@ -461,7 +461,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, QueuedSharedWorkerShutdown) { ...@@ -461,7 +461,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, QueuedSharedWorkerShutdown) {
// Flaky, http://crbug.com/69881. // Flaky, http://crbug.com/69881.
// Sometimes triggers // Sometimes triggers
// Check failed: message_ports_[message_port_id].queued_messages.empty(). // Check failed: message_ports_[message_port_id].queued_messages.empty().
IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_MultipleTabsQueuedSharedWorker) { IN_PROC_BROWSER_TEST_F(WorkerTest, MultipleTabsQueuedSharedWorker) {
// Tests to make sure that only one instance of queued shared workers are // Tests to make sure that only one instance of queued shared workers are
// started up even when those instances are on multiple tabs. // started up even when those instances are on multiple tabs.
int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate; int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
...@@ -484,7 +484,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_MultipleTabsQueuedSharedWorker) { ...@@ -484,7 +484,7 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_MultipleTabsQueuedSharedWorker) {
} }
// Flaky: http://crbug.com/48148 // Flaky: http://crbug.com/48148
IN_PROC_BROWSER_TEST_F(WorkerTest, DISABLED_QueuedSharedWorkerStartedFromOtherTab) { IN_PROC_BROWSER_TEST_F(WorkerTest, QueuedSharedWorkerStartedFromOtherTab) {
// Tests to make sure that queued shared workers are started up when // Tests to make sure that queued shared workers are started up when
// an instance is launched from another tab. // an instance is launched from another tab.
int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate; int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment