diff options
| author | jrt@chromium.org <jrt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 16:47:45 +0000 |
|---|---|---|
| committer | jrt@chromium.org <jrt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 16:47:45 +0000 |
| commit | 1429a095ca7e3c05baafd622e61417aed5247ab6 (patch) | |
| tree | 982827ae58ef47d0ddc244800eeb6becdb3c1b01 /content/worker | |
| parent | 41110ca3f3f992498d189e6936dc5c4c2d12b916 (diff) | |
| download | chromium_src-1429a095ca7e3c05baafd622e61417aed5247ab6.zip chromium_src-1429a095ca7e3c05baafd622e61417aed5247ab6.tar.gz chromium_src-1429a095ca7e3c05baafd622e61417aed5247ab6.tar.bz2 | |
Chromium-branding bug fix and test re-enable.
After revision 90141, the WorkerTest.TerminateQueuedWorkers failed on mac
ui_tests. The test was disabled in revision 90152. Now the bug is resolved,
the test is re-enabled and passes on mac ui_tests.
BUG=87204
Review URL: http://codereview.chromium.org/7240014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90593 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
| -rw-r--r-- | content/worker/test/worker_uitest.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc index 5748ea6..d6b884e 100644 --- a/content/worker/test/worker_uitest.cc +++ b/content/worker/test/worker_uitest.cc @@ -190,11 +190,6 @@ TEST_F(WorkerTest, MultipleSharedWorkers) { #define TerminateQueuedWorkers FLAKY_TerminateQueuedWorkers #endif -#if defined(OS_MACOSX) -// http://crbug.com/87204 -#define TerminateQueuedWorkers DISABLED_TerminateQueuedWorkers -#endif - TEST_F(WorkerTest, TerminateQueuedWorkers) { ASSERT_TRUE(WaitForProcessCountToBe(1, 0)); RunTest(FilePath(FILE_PATH_LITERAL("terminate_queued_workers.html")), ""); |