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

11 files changed, 17 insertions, 16 deletions

diff --git a/chrome/common/net/url_fetcher_unittest.cc b/chrome/common/net/url_fetcher_unittest.cc
index 020cc21..5e39c2a 100644
--- a/chrome/common/net/url_fetcher_unittest.cc
+++ b/chrome/common/net/url_fetcher_unittest.cc
@@ -10,7 +10,7 @@
 #include "chrome/common/net/url_fetcher_protect.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "net/http/http_response_headers.h"
-#include "net/socket/ssl_test_util.h"
+#include "net/test/test_server.h"
 #include "net/url_request/url_request_unittest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/test/live_sync/live_sync_test.h b/chrome/test/live_sync/live_sync_test.h
index e953170..33aa8e3 100644
--- a/chrome/test/live_sync/live_sync_test.h
+++ b/chrome/test/live_sync/live_sync_test.h
@@ -13,7 +13,7 @@
 #include "base/scoped_vector.h"
 #include "chrome/test/live_sync/profile_sync_service_test_harness.h"
 #include "net/base/mock_host_resolver.h"
-#include "net/socket/ssl_test_util.h"
+#include "net/test/test_server.h"
 
 #include <string>
 #include <vector>
diff --git a/net/net.gyp b/net/net.gyp
index 93338f5..c87bdcbd 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -921,8 +921,8 @@
         'proxy/proxy_config_service_common_unittest.h',
         'socket/socket_test_util.cc',
         'socket/socket_test_util.h',
-        'socket/ssl_test_util.cc',
-        'socket/ssl_test_util.h',
+        'test/test_server.cc',
+        'test/test_server.h',
       ],
       'conditions': [
         ['inside_chromium_build==1', {
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 2f7526a..a62927e 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -14,8 +14,8 @@
 #include "net/base/test_completion_callback.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/socket_test_util.h"
-#include "net/socket/ssl_test_util.h"
 #include "net/socket/tcp_client_socket.h"
+#include "net/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/net/socket/ssl_test_util.cc b/net/test/test_server.cc
index 4fa6b9b..4abed54 100644
--- a/net/socket/ssl_test_util.cc
+++ b/net/test/test_server.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/socket/ssl_test_util.h"
+#include "net/test/test_server.h"
 
 #include <algorithm>
 #include <string>
diff --git a/net/socket/ssl_test_util.h b/net/test/test_server.h
index 750bceb..25f2c8b 100644
--- a/net/socket/ssl_test_util.h
+++ b/net/test/test_server.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_SOCKET_SSL_TEST_UTIL_H_
-#define NET_SOCKET_SSL_TEST_UTIL_H_
+#ifndef NET_TEST_TEST_SERVER_H_
+#define NET_TEST_TEST_SERVER_H_
 
 #include "build/build_config.h"
 
@@ -146,4 +146,4 @@ bool LaunchTestServerAsJob(const std::wstring& cmdline,
 
 }  // namespace net
 
-#endif  // NET_SOCKET_SSL_TEST_UTIL_H_
+#endif  // NET_TEST_TEST_SERVER_H_
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 3c18312..d1a542a 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -39,7 +39,7 @@
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/proxy/proxy_service.h"
-#include "net/socket/ssl_test_util.h"
+#include "net/test/test_server.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_file_dir_job.h"
 #include "net/url_request/url_request_http_job.h"
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index f8fee49..8f090ef 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -33,7 +33,7 @@
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
-#include "net/socket/ssl_test_util.h"
+#include "net/test/test_server.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/proxy/proxy_service.h"
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);