diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 01:19:31 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 01:19:31 +0000 |
| commit | 1b9565c618315cd50b80ef2f2b696e15c4801f17 (patch) | |
| tree | c1198c7a24938b80fa7ff491d48b8a1d7986ddcb /webkit | |
| parent | 9ecc2dee313ed8d32a8aabe738c97d231bea8f98 (diff) | |
| download | chromium_src-1b9565c618315cd50b80ef2f2b696e15c4801f17.zip chromium_src-1b9565c618315cd50b80ef2f2b696e15c4801f17.tar.gz chromium_src-1b9565c618315cd50b80ef2f2b696e15c4801f17.tar.bz2 | |
GTTF: Move net/socket/ssl_test_util to net/test/test_server
This is a first step to make test server easier to use
and more reliable.
TEST=none
BUG=49680
Review URL: http://codereview.chromium.org/3040011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/DEPS | 1 | ||||
| -rw-r--r-- | webkit/support/test_webkit_client.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_main.cc | 8 |
3 files changed, 6 insertions, 5 deletions
diff --git a/webkit/DEPS b/webkit/DEPS index f22e86d..f41af78 100644 --- a/webkit/DEPS +++ b/webkit/DEPS @@ -23,6 +23,7 @@ include_rules = [ "+net/proxy", "+net/socket", "+net/socket_stream", + "+net/test", "+net/url_request", "+net/websockets", "+third_party/npapi/bindings", diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc index dc93685..df2e439 100644 --- a/webkit/support/test_webkit_client.cc +++ b/webkit/support/test_webkit_client.cc @@ -9,7 +9,7 @@ #include "base/string_util.h" #include "net/base/cookie_monster.h" #include "net/http/http_cache.h" -#include "net/socket/ssl_test_util.h" +#include "net/test/test_server.h" #include "media/base/media.h" #include "third_party/WebKit/WebKit/chromium/public/WebData.h" #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index 5cca69d..203265d 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -23,7 +23,7 @@ #include "net/base/net_module.h" #include "net/base/net_util.h" #include "net/http/http_cache.h" -#include "net/socket/ssl_test_util.h" +#include "net/test/test_server.h" #include "net/url_request/url_request_context.h" #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" @@ -112,10 +112,10 @@ int main(int argc, char* argv[]) { bool enable_gp_fault_error_box = false; enable_gp_fault_error_box = parsed_command_line.HasSwitch(test_shell::kGPFaultErrorBox); - - bool allow_external_pages = + + bool allow_external_pages = parsed_command_line.HasSwitch(test_shell::kAllowExternalPages); - + TestShell::InitLogging(suppress_error_dialogs, layout_test_mode, enable_gp_fault_error_box); |