summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authorrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-25 00:33:11 +0000
committerrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-25 00:33:11 +0000
commitce61f226b76a8e31b16a865b691d2a578f02f9d6 (patch)
tree040ee9305b0570f7fcec8cef96a565183726c4e4 /chrome/worker
parent271ca3ebe9075d90aa4122aa2a86b341539edd69 (diff)
downloadchromium_src-ce61f226b76a8e31b16a865b691d2a578f02f9d6.zip
chromium_src-ce61f226b76a8e31b16a865b691d2a578f02f9d6.tar.gz
chromium_src-ce61f226b76a8e31b16a865b691d2a578f02f9d6.tar.bz2
Add an WebSocket extension browsertest.
This adds a simple browsertest that sanity checks that WebSockets can be opened and used from extension processes. BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/660011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index b19ebd2..b36f9dd 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -9,6 +9,7 @@
#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/ui/ui_layout_test.h"
+#include "chrome/test/ui_test_utils.h"
#include "net/url_request/url_request_unittest.h"
static const char kTestCompleteCookie[] = "status";
@@ -378,10 +379,10 @@ TEST_F(WorkerTest, FLAKY_WorkerWebSocketLayoutTests) {
test_case_dir_ = test_case_dir_.AppendASCII("tests");
test_case_dir_ = test_case_dir_.AppendASCII("workers");
- StartWebSocketServer(temp_test_dir_.AppendASCII("LayoutTests"));
+ ui_test_utils::TestWebSocketServer websocket_server(
+ temp_test_dir_.AppendASCII("LayoutTests"));
for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
RunLayoutTest(kLayoutTestFiles[i], kWebSocketPort);
- StopWebSocketServer();
}
TEST_F(WorkerTest, WorkerXhrHttpLayoutTests) {