diff options
| author | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-13 08:29:18 +0000 |
|---|---|---|
| committer | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-13 08:29:18 +0000 |
| commit | e8824b5c455da4ecbc012be47b651e28e11828b5 (patch) | |
| tree | 9bd582c1be4db176dcf3792c00de01587e028674 | |
| parent | 51fd18b10aa37d57d2c4a42581e98423629780d0 (diff) | |
| download | chromium_src-e8824b5c455da4ecbc012be47b651e28e11828b5.zip chromium_src-e8824b5c455da4ecbc012be47b651e28e11828b5.tar.gz chromium_src-e8824b5c455da4ecbc012be47b651e28e11828b5.tar.bz2 | |
WebKit roll 57501:57508 + fixing the path to the script that starts a
websocket server. Submitting this as a 2-sided patch to make it easier
to roll it back if something breaks.
BUG=none
TEST=none
TBR=antonm
Review URL: http://codereview.chromium.org/1521026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44336 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/test/ui_test_utils.cc | 5 | ||||
| -rw-r--r-- | chrome/test/ui_test_utils.h | 3 |
3 files changed, 3 insertions, 7 deletions
@@ -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 |