summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--chrome/test/ui_test_utils.cc5
-rw-r--r--chrome/test/ui_test_utils.h3
3 files changed, 3 insertions, 7 deletions
diff --git a/DEPS b/DEPS
index b0b6f58..491b4e5 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "57501",
+ "webkit_revision": "57508",
"ffmpeg_revision": "43776",
"skia_revision": "504",
"chromium_git": "http://src.chromium.org/git",
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index 612d921..9f01ff2 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -679,10 +679,7 @@ CommandLine* TestWebSocketServer::CreateWebSocketServerCommandLine() {
script_path = script_path.AppendASCII("WebKit");
script_path = script_path.AppendASCII("WebKitTools");
script_path = script_path.AppendASCII("Scripts");
- script_path = script_path.AppendASCII("webkitpy");
- script_path = script_path.AppendASCII("layout_tests");
- script_path = script_path.AppendASCII("port");
- script_path = script_path.AppendASCII("websocket_server.py");
+ script_path = script_path.AppendASCII("new-run-webkit-websocketserver");
CommandLine* cmd_line = CreatePythonCommandLine();
cmd_line->AppendLooseValue(script_path.ToWStringHack());
diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h
index 9543f9d..72c34c2 100644
--- a/chrome/test/ui_test_utils.h
+++ b/chrome/test/ui_test_utils.h
@@ -222,8 +222,7 @@ class TimedMessageLoopRunner {
// object, and is stopped when the destructor is called. Note that
// because of the underlying script that is used:
//
-// third_paty/WebKit/WebKitTools/Scripts/webkitpy/layout_tests/port/
-// websocket_server.py
+// third_paty/WebKit/WebKitTools/Scripts/new-run-webkit-websocketserver
//
// Only *_wsh.py handlers found under "websocket/tests" from the
// |root_directory| will be found and active while running the test