diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 04:50:33 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 04:50:33 +0000 |
| commit | be580e38b6c46a4a71051816feed7556de3c4add (patch) | |
| tree | 3be222d469578c6ace03761d3aff05956198f1f6 /content | |
| parent | 02bd556416dc7390923139825ed6817269227d08 (diff) | |
| download | chromium_src-be580e38b6c46a4a71051816feed7556de3c4add.zip chromium_src-be580e38b6c46a4a71051816feed7556de3c4add.tar.gz chromium_src-be580e38b6c46a4a71051816feed7556de3c4add.tar.bz2 | |
Enable ExtensionApiTest.WebSocket and WorkerTest.WorkerWebSocketLayoutTests
WebKit side broken scripts were fixed and rolled.
Disabled tests are ready to be re-enabled.
BUG=111165
TEST=browser_tests; ui_tests
TBR=hbono@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9235027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/worker/test/worker_uitest.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc index 38c40d3..29c32d0 100644 --- a/content/worker/test/worker_uitest.cc +++ b/content/worker/test/worker_uitest.cc @@ -472,14 +472,7 @@ TEST_F(WorkerTest, DISABLED_WorkerHttpLayoutTests) { ASSERT_TRUE(http_server.Stop()); } -// TODO(toyoshim): Enable disabled tests. -// http://crbug.com/111165 . -#if defined(OS_WIN) -#define MAYBE_WorkerWebSocketLayoutTests DISABLED_WorkerWebSocketLayoutTests -#else -#define MAYBE_WorkerWebSocketLayoutTests WorkerWebSocketLayoutTests -#endif -TEST_F(WorkerTest, MAYBE_WorkerWebSocketLayoutTests) { +TEST_F(WorkerTest, WorkerWebSocketLayoutTests) { static const char* kLayoutTestFiles[] = { "close-in-onmessage-crash.html", "close-in-shared-worker.html", |