diff options
Diffstat (limited to 'chrome/browser')
53 files changed, 258 insertions, 251 deletions
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index 5063e6b..20594a2 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -14,8 +14,8 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" -#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/dom_operation_notification_details.h" #include "content/public/browser/notification_registrar.h" @@ -25,7 +25,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index 90ac2b9..80fbd18 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc @@ -1557,8 +1557,8 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, HttpsNonTimeoutError) { // Make sure no captive portal test triggers on HTTPS timeouts of iframes. IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, HttpsIframeTimeout) { // Use an HTTPS server for the top level page. - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, net::TestServer::kLocalhost, + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); @@ -1609,11 +1609,11 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, RedirectSSLCertError) { // Need an HTTP TestServer to handle a dynamically created server redirect. ASSERT_TRUE(test_server()->Start()); - net::TestServer::SSLOptions ssl_options; + net::SpawnedTestServer::SSLOptions ssl_options; ssl_options.server_certificate = - net::TestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, ssl_options, + net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, ssl_options, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); @@ -1697,11 +1697,11 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, SSLCertErrorLogin) { // Need an HTTP TestServer to handle a dynamically created server redirect. ASSERT_TRUE(test_server()->Start()); - net::TestServer::SSLOptions https_options; + net::SpawnedTestServer::SSLOptions https_options; https_options.server_certificate = - net::TestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, https_options, + net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, https_options, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); @@ -2158,8 +2158,8 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, HttpToHttpsRedirectLogin) { // An HTTPS page redirects to an HTTP page. IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, HttpsToHttpRedirect) { // Use an HTTPS server for the top level page. - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, net::TestServer::kLocalhost, + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); diff --git a/chrome/browser/chrome_security_exploit_browsertest.cc b/chrome/browser/chrome_security_exploit_browsertest.cc index 2ac5cdc..2a181b8 100644 --- a/chrome/browser/chrome_security_exploit_browsertest.cc +++ b/chrome/browser/chrome_security_exploit_browsertest.cc @@ -32,9 +32,9 @@ class ChromeSecurityExploitBrowserTest : public InProcessBrowserTest { virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { ASSERT_TRUE(test_server()->Start()); - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, - net::TestServer::kLocalhost, + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, + net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); diff --git a/chrome/browser/chrome_switches_browsertest.cc b/chrome/browser/chrome_switches_browsertest.cc index 859b1d6..ad89341 100644 --- a/chrome/browser/chrome_switches_browsertest.cc +++ b/chrome/browser/chrome_switches_browsertest.cc @@ -10,7 +10,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" class HostRulesTest : public InProcessBrowserTest { protected: diff --git a/chrome/browser/collected_cookies_browsertest.cc b/chrome/browser/collected_cookies_browsertest.cc index b8548e8..2f9fce7 100644 --- a/chrome/browser/collected_cookies_browsertest.cc +++ b/chrome/browser/collected_cookies_browsertest.cc @@ -13,7 +13,7 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" namespace { diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc index f4105ad..120118d3 100644 --- a/chrome/browser/content_settings/content_settings_browsertest.cc +++ b/chrome/browser/content_settings/content_settings_browsertest.cc @@ -29,7 +29,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/test/net/url_request_mock_http_job.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. @@ -43,10 +43,10 @@ using content::URLRequestMockHTTPJob; class ContentSettingsTest : public InProcessBrowserTest { public: ContentSettingsTest() - : https_server_( - net::TestServer::TYPE_HTTPS, - net::TestServer::SSLOptions(net::TestServer::SSLOptions::CERT_OK), - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { + : https_server_(net::SpawnedTestServer::TYPE_HTTPS, + net::SpawnedTestServer::SSLOptions( + net::SpawnedTestServer::SSLOptions::CERT_OK), + base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { } virtual void SetUpOnMainThread() OVERRIDE { @@ -102,7 +102,7 @@ class ContentSettingsTest : public InProcessBrowserTest { ASSERT_FALSE(GetCookies(browser()->profile(), url).empty()); } - net::TestServer https_server_; + net::SpawnedTestServer https_server_; }; // Sanity check on cookies before we do other tests. While these can be written diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc index 5290dcb..408dc80 100644 --- a/chrome/browser/devtools/devtools_sanity_browsertest.cc +++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc @@ -45,7 +45,7 @@ #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "net/socket/tcp_listen_socket.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" using content::BrowserThread; using content::DevToolsManager; diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index b26b5a2..6f687a9 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -78,7 +78,7 @@ #include "content/test/net/url_request_slow_download_job.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" #include "webkit/plugins/npapi/mock_plugin_list.h" diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc index d7f2ea4..75be463 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h" #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h" #include "content/public/browser/resource_request_info.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -109,9 +109,9 @@ TEST(WebRequestConditionAttributeTest, ContentType) { std::string error; scoped_ptr<WebRequestConditionAttribute> result; - net::TestServer test_server( - net::TestServer::TYPE_HTTP, - net::TestServer::kLocalhost, + net::SpawnedTestServer test_server( + net::SpawnedTestServer::TYPE_HTTP, + net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL( "chrome/test/data/extensions/api_test/webrequest/declarative"))); ASSERT_TRUE(test_server.Start()); @@ -479,9 +479,9 @@ TEST(WebRequestConditionAttributeTest, ResponseHeaders) { // Necessary for TestURLRequest. MessageLoop message_loop(MessageLoop::TYPE_IO); - net::TestServer test_server( - net::TestServer::TYPE_HTTP, - net::TestServer::kLocalhost, + net::SpawnedTestServer test_server( + net::SpawnedTestServer::TYPE_HTTP, + net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL( "chrome/test/data/extensions/api_test/webrequest/declarative"))); ASSERT_TRUE(test_server.Start()); diff --git a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc index ff7fae7..78af25e 100644 --- a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc @@ -19,7 +19,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "net/dns/mock_host_resolver.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "testing/gmock/include/gmock/gmock.h" namespace extensions { diff --git a/chrome/browser/extensions/api/i18n/i18n_apitest.cc b/chrome/browser/extensions/api/i18n/i18n_apitest.cc index 1255946..0fb7111 100644 --- a/chrome/browser/extensions/api/i18n/i18n_apitest.cc +++ b/chrome/browser/extensions/api/i18n/i18n_apitest.cc @@ -10,7 +10,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18N) { ASSERT_TRUE(StartTestServer()); diff --git a/chrome/browser/extensions/api/socket/socket_apitest.cc b/chrome/browser/extensions/api/socket/socket_apitest.cc index b9b4451..bb4e3d0 100644 --- a/chrome/browser/extensions/api/socket/socket_apitest.cc +++ b/chrome/browser/extensions/api/socket/socket_apitest.cc @@ -16,7 +16,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "net/dns/mock_host_resolver.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" using extensions::Extension; @@ -121,10 +121,11 @@ IN_PROC_BROWSER_TEST_F(SocketApiTest, GetNetworkList) { } IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketUDPExtension) { - scoped_ptr<net::TestServer> test_server( - new net::TestServer(net::TestServer::TYPE_UDP_ECHO, - net::TestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL("net/data")))); + scoped_ptr<net::SpawnedTestServer> test_server( + new net::SpawnedTestServer( + net::SpawnedTestServer::TYPE_UDP_ECHO, + net::SpawnedTestServer::kLocalhost, + base::FilePath(FILE_PATH_LITERAL("net/data")))); EXPECT_TRUE(test_server->Start()); net::HostPortPair host_port_pair = test_server->host_port_pair(); @@ -148,10 +149,11 @@ IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketUDPExtension) { } IN_PROC_BROWSER_TEST_F(SocketApiTest, SocketTCPExtension) { - scoped_ptr<net::TestServer> test_server( - new net::TestServer(net::TestServer::TYPE_TCP_ECHO, - net::TestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL("net/data")))); + scoped_ptr<net::SpawnedTestServer> test_server( + new net::SpawnedTestServer( + net::SpawnedTestServer::TYPE_TCP_ECHO, + net::SpawnedTestServer::kLocalhost, + base::FilePath(FILE_PATH_LITERAL("net/data")))); EXPECT_TRUE(test_server->Start()); net::HostPortPair host_port_pair = test_server->host_port_pair(); diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index 8d072ae..bb2279c 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc @@ -19,7 +19,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "net/base/net_util.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" namespace { @@ -301,9 +301,9 @@ bool ExtensionApiTest::StartTestServer() { bool ExtensionApiTest::StartWebSocketServer( const base::FilePath& root_directory) { - websocket_server_.reset(new net::TestServer( - net::TestServer::TYPE_WS, - net::TestServer::kLocalhost, + websocket_server_.reset(new net::SpawnedTestServer( + net::SpawnedTestServer::TYPE_WS, + net::SpawnedTestServer::kLocalhost, root_directory)); if (!websocket_server_->Start()) diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h index 8d3d2e0..cbfd55b 100644 --- a/chrome/browser/extensions/extension_apitest.h +++ b/chrome/browser/extensions/extension_apitest.h @@ -181,7 +181,7 @@ class ExtensionApiTest : public ExtensionBrowserTest { scoped_ptr<DictionaryValue> test_config_; // Hold the test WebSocket server. - scoped_ptr<net::TestServer> websocket_server_; + scoped_ptr<net::SpawnedTestServer> websocket_server_; }; #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_APITEST_H_ diff --git a/chrome/browser/extensions/stubs_apitest.cc b/chrome/browser/extensions/stubs_apitest.cc index b86da70..5a41bdb 100644 --- a/chrome/browser/extensions/stubs_apitest.cc +++ b/chrome/browser/extensions/stubs_apitest.cc @@ -6,7 +6,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/test/base/ui_test_utils.h" #include "googleurl/src/gurl.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" // Tests that we throw errors when you try using extension APIs that aren't // supported in content scripts. diff --git a/chrome/browser/extensions/subscribe_page_action_browsertest.cc b/chrome/browser/extensions/subscribe_page_action_browsertest.cc index 02449a1..d1f5afa 100644 --- a/chrome/browser/extensions/subscribe_page_action_browsertest.cc +++ b/chrome/browser/extensions/subscribe_page_action_browsertest.cc @@ -59,7 +59,7 @@ static const char kScriptError[] = " \"No error\"" ");"; -GURL GetFeedUrl(net::TestServer* server, const std::string& feed_page, +GURL GetFeedUrl(net::SpawnedTestServer* server, const std::string& feed_page, bool direct_url, std::string extension_id) { GURL feed_url = server->GetURL(feed_page); if (direct_url) { @@ -96,7 +96,7 @@ bool ValidatePageElement(WebContents* tab, // extension to kick in, detect the feed and redirect to a feed preview page. // |sniff_xml_type| is generally set to true if the feed is sniffable and false // for invalid feeds. -void NavigateToFeedAndValidate(net::TestServer* server, +void NavigateToFeedAndValidate(net::SpawnedTestServer* server, const std::string& url, Browser* browser, std::string extension_id, diff --git a/chrome/browser/external_extension_browsertest.cc b/chrome/browser/external_extension_browsertest.cc index a724213..27a735a 100644 --- a/chrome/browser/external_extension_browsertest.cc +++ b/chrome/browser/external_extension_browsertest.cc @@ -13,7 +13,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" namespace { diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 520cf14..147a454 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -31,7 +31,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "net/base/net_util.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" using content::DomOperationNotificationDetails; using content::NavigationController; diff --git a/chrome/browser/history/multipart_browsertest.cc b/chrome/browser/history/multipart_browsertest.cc index 2c6d0ae7..3fe4a49 100644 --- a/chrome/browser/history/multipart_browsertest.cc +++ b/chrome/browser/history/multipart_browsertest.cc @@ -11,7 +11,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/frame_navigate_params.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" class MultipartResponseTest : public InProcessBrowserTest, public content::WebContentsObserver { diff --git a/chrome/browser/history/redirect_browsertest.cc b/chrome/browser/history/redirect_browsertest.cc index 0f56a71..2387fdc 100644 --- a/chrome/browser/history/redirect_browsertest.cc +++ b/chrome/browser/history/redirect_browsertest.cc @@ -29,7 +29,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "net/base/net_util.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "ui/base/events/event_constants.h" class RedirectTest : public InProcessBrowserTest { diff --git a/chrome/browser/infobars/infobars_browsertest.cc b/chrome/browser/infobars/infobars_browsertest.cc index ed807a0..6e4eb69 100644 --- a/chrome/browser/infobars/infobars_browsertest.cc +++ b/chrome/browser/infobars/infobars_browsertest.cc @@ -17,7 +17,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/ui/ui_test.h" #include "content/public/browser/notification_service.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" class InfoBarsTest : public InProcessBrowserTest { public: diff --git a/chrome/browser/loadtimes_extension_bindings_browsertest.cc b/chrome/browser/loadtimes_extension_bindings_browsertest.cc index 6eaa71a..d911351 100644 --- a/chrome/browser/loadtimes_extension_bindings_browsertest.cc +++ b/chrome/browser/loadtimes_extension_bindings_browsertest.cc @@ -8,7 +8,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" class LoadtimesExtensionBindingsTest : public InProcessBrowserTest { public: diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc index 1da711e..010b628 100644 --- a/chrome/browser/media/chrome_webrtc_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_browsertest.cc @@ -21,7 +21,7 @@ #include "chrome/test/ui/ui_test.h" #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" static const base::FilePath::CharType kPeerConnectionServer[] = #if defined(OS_WIN) diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc index 3f537b0..a56759d 100644 --- a/chrome/browser/net/connection_tester_unittest.cc +++ b/chrome/browser/net/connection_tester_unittest.cc @@ -17,7 +17,7 @@ #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_service.h" #include "net/ssl/ssl_config_service_defaults.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "net/url_request/url_request_context.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" @@ -89,8 +89,8 @@ class ConnectionTesterTest : public PlatformTest { ConnectionTesterTest() : message_loop_(MessageLoop::TYPE_IO), io_thread_(BrowserThread::IO, &message_loop_), - test_server_(net::TestServer::TYPE_HTTP, - net::TestServer::kLocalhost, + test_server_(net::SpawnedTestServer::TYPE_HTTP, + net::SpawnedTestServer::kLocalhost, // Nothing is read in this directory. base::FilePath(FILE_PATH_LITERAL("chrome"))), proxy_script_fetcher_context_(new net::URLRequestContext) { @@ -105,7 +105,7 @@ class ConnectionTesterTest : public PlatformTest { // no-op, and the ObserverList will contain invalid entries. MessageLoop message_loop_; content::TestBrowserThread io_thread_; - net::TestServer test_server_; + net::SpawnedTestServer test_server_; ConnectionTesterDelegate test_delegate_; net::MockHostResolver host_resolver_; scoped_ptr<net::CertVerifier> cert_verifier_; diff --git a/chrome/browser/net/cookie_policy_browsertest.cc b/chrome/browser/net/cookie_policy_browsertest.cc index 5a5ba24..499a02a 100644 --- a/chrome/browser/net/cookie_policy_browsertest.cc +++ b/chrome/browser/net/cookie_policy_browsertest.cc @@ -14,7 +14,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test_utils.h" #include "net/dns/mock_host_resolver.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" using content::BrowserThread; diff --git a/chrome/browser/net/ftp_browsertest.cc b/chrome/browser/net/ftp_browsertest.cc index 8e54e318..f8d2295 100644 --- a/chrome/browser/net/ftp_browsertest.cc +++ b/chrome/browser/net/ftp_browsertest.cc @@ -5,19 +5,19 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "googleurl/src/gurl.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" class FtpBrowserTest : public InProcessBrowserTest { public: FtpBrowserTest() - : ftp_server_(net::TestServer::TYPE_FTP, - net::TestServer::kLocalhost, + : ftp_server_(net::SpawnedTestServer::TYPE_FTP, + net::SpawnedTestServer::kLocalhost, base::FilePath()) { } protected: - net::TestServer ftp_server_; + net::SpawnedTestServer ftp_server_; }; IN_PROC_BROWSER_TEST_F(FtpBrowserTest, DirectoryListing) { diff --git a/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc b/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc index f582d1b..eb177c5 100644 --- a/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc +++ b/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc @@ -19,9 +19,9 @@ #include "content/public/test/test_browser_thread.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" +#include "net/test/spawned_test_server.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_test_util.h" -#include "net/test/test_server.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -81,8 +81,8 @@ using testing::StrEq; class HttpPipeliningCompatibilityClientTest : public testing::Test { public: HttpPipeliningCompatibilityClientTest() - : test_server_(net::TestServer::TYPE_HTTP, - net::TestServer::kLocalhost, + : test_server_(net::SpawnedTestServer::TYPE_HTTP, + net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL( "chrome/test/data/http_pipelining"))), io_thread_(BrowserThread::IO, &message_loop_) { @@ -205,7 +205,7 @@ class HttpPipeliningCompatibilityClientTest : public testing::Test { } MessageLoopForIO message_loop_; - net::TestServer test_server_; + net::SpawnedTestServer test_server_; net::TestURLRequestContextGetter* context_; content::TestBrowserThread io_thread_; diff --git a/chrome/browser/net/load_timing_browsertest.cc b/chrome/browser/net/load_timing_browsertest.cc index 6519f4e..4f8f24d 100644 --- a/chrome/browser/net/load_timing_browsertest.cc +++ b/chrome/browser/net/load_timing_browsertest.cc @@ -22,7 +22,7 @@ #include "content/public/test/browser_test_utils.h" #include "googleurl/src/gurl.h" #include "net/base/load_timing_info.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "net/url_request/url_request_file_job.h" #include "net/url_request/url_request_filter.h" #include "net/url_request/url_request_job_factory.h" diff --git a/chrome/browser/net/network_stats_unittest.cc b/chrome/browser/net/network_stats_unittest.cc index 99dffb2..81c30e8 100644 --- a/chrome/browser/net/network_stats_unittest.cc +++ b/chrome/browser/net/network_stats_unittest.cc @@ -10,7 +10,7 @@ #include "net/base/test_completion_callback.h" #include "net/dns/host_resolver.h" #include "net/dns/mock_host_resolver.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" @@ -30,8 +30,8 @@ class NetworkStatsTest : public PlatformTest { class NetworkStatsTestUDP : public NetworkStatsTest { public: NetworkStatsTestUDP() - : test_server_(net::TestServer::TYPE_UDP_ECHO, - net::TestServer::kLocalhost, + : test_server_(net::SpawnedTestServer::TYPE_UDP_ECHO, + net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("net/data"))) { } @@ -57,7 +57,7 @@ class NetworkStatsTestUDP : public NetworkStatsTest { EXPECT_EQ(0, rv); } - net::TestServer test_server_; + net::SpawnedTestServer test_server_; }; TEST_F(NetworkStatsTestUDP, UDPEcho100BytesHasProxy) { diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc index 791c16ba..2f1f728 100644 --- a/chrome/browser/net/proxy_browsertest.cc +++ b/chrome/browser/net/proxy_browsertest.cc @@ -22,7 +22,7 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/test/browser_test_utils.h" #include "net/base/test_data_directory.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" namespace { @@ -58,8 +58,8 @@ class LoginPromptObserver : public content::NotificationObserver { class ProxyBrowserTest : public InProcessBrowserTest { public: ProxyBrowserTest() - : proxy_server_(net::TestServer::TYPE_BASIC_AUTH_PROXY, - net::TestServer::kLocalhost, + : proxy_server_(net::SpawnedTestServer::TYPE_BASIC_AUTH_PROXY, + net::SpawnedTestServer::kLocalhost, base::FilePath()) { } @@ -74,7 +74,7 @@ class ProxyBrowserTest : public InProcessBrowserTest { } protected: - net::TestServer proxy_server_; + net::SpawnedTestServer proxy_server_; private: @@ -91,9 +91,9 @@ class ProxyBrowserTest : public InProcessBrowserTest { // that requires basic authentication. IN_PROC_BROWSER_TEST_F(ProxyBrowserTest, MAYBE_BasicAuthWSConnect) { // Launch WebSocket server. - net::TestServer ws_server(net::TestServer::TYPE_WS, - net::TestServer::kLocalhost, - net::GetWebSocketTestDataDirectory()); + net::SpawnedTestServer ws_server(net::SpawnedTestServer::TYPE_WS, + net::SpawnedTestServer::kLocalhost, + net::GetWebSocketTestDataDirectory()); ASSERT_TRUE(ws_server.Start()); content::WebContents* tab = diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc index bd7f8ee..06442c4 100644 --- a/chrome/browser/net/websocket_browsertest.cc +++ b/chrome/browser/net/websocket_browsertest.cc @@ -10,27 +10,27 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test_utils.h" #include "net/base/test_data_directory.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" namespace { class WebSocketBrowserTest : public InProcessBrowserTest { public: WebSocketBrowserTest() - : ws_server_(net::TestServer::TYPE_WS, - net::TestServer::kLocalhost, + : ws_server_(net::SpawnedTestServer::TYPE_WS, + net::SpawnedTestServer::kLocalhost, net::GetWebSocketTestDataDirectory()), - wss_server_(net::TestServer::TYPE_WSS, + wss_server_(net::SpawnedTestServer::TYPE_WSS, SSLOptions(SSLOptions::CERT_OK), net::GetWebSocketTestDataDirectory()) { } protected: - net::TestServer ws_server_; - net::TestServer wss_server_; + net::SpawnedTestServer ws_server_; + net::SpawnedTestServer wss_server_; private: - typedef net::TestServer::SSLOptions SSLOptions; + typedef net::SpawnedTestServer::SSLOptions SSLOptions; DISALLOW_COPY_AND_ASSIGN(WebSocketBrowserTest); }; diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc index 55695c6..6ac1965 100644 --- a/chrome/browser/notifications/notification_browsertest.cc +++ b/chrome/browser/notifications/notification_browsertest.cc @@ -41,7 +41,7 @@ #include "content/public/test/test_utils.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index ab942b6..2c85c34 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -993,24 +993,25 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { bool prerender_should_wait_for_ready_title) { dest_url_ = destination_url; - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( make_pair("REPLACE_WITH_PRERENDER_URL", prerender_url.spec())); replacement_text.push_back( make_pair("REPLACE_WITH_DESTINATION_URL", destination_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( + ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( loader_path_, replacement_text, &replacement_path)); - const net::TestServer* src_server = test_server(); - scoped_ptr<net::TestServer> https_src_server; + const net::SpawnedTestServer* src_server = test_server(); + scoped_ptr<net::SpawnedTestServer> https_src_server; if (use_https_src_server_) { https_src_server.reset( - new net::TestServer( - net::TestServer::TYPE_HTTPS, net::TestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data")))); + new net::SpawnedTestServer( + net::SpawnedTestServer::TYPE_HTTPS, + net::SpawnedTestServer::kLocalhost, + base::FilePath(FILE_PATH_LITERAL("chrome/test/data")))); ASSERT_TRUE(https_src_server->Start()); src_server = https_src_server.get(); } @@ -1513,8 +1514,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // Checks that a prerender for an https will prevent a prerender from happening. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHttps) { - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, net::TestServer::kLocalhost, + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); @@ -1526,8 +1527,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHttps) { // Checks that client-issued redirects to an https page will cancel prerenders. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectToHttps) { - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, net::TestServer::kLocalhost, + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); @@ -1542,11 +1543,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectToHttps) { IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectInIframe) { std::string redirect_path = CreateClientRedirect( "/files/prerender/prerender_embedded_content.html"); - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_URL", "/" + redirect_path)); std::string replacement_path; - ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( + ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( "files/prerender/prerender_with_iframe.html", replacement_text, &replacement_path)); @@ -1561,17 +1562,17 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectInIframe) { // count as an "alias" for the prerendered page. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectToHttpsInIframe) { - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, net::TestServer::kLocalhost, + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); std::string redirect_path = CreateClientRedirect(https_url.spec()); - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_URL", "/" + redirect_path)); std::string replacement_path; - ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( + ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( "files/prerender/prerender_with_iframe.html", replacement_text, &replacement_path)); @@ -1619,8 +1620,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // location will cancel prerendering. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderServerRedirectToHttps) { - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, net::TestServer::kLocalhost, + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); @@ -1635,11 +1636,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderServerRedirectInIframe) { std::string redirect_path = CreateServerRedirect( "/files/prerender/prerender_embedded_content.html"); - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_URL", "/" + redirect_path)); std::string replacement_path; - ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( + ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( "files/prerender/prerender_with_iframe.html", replacement_text, &replacement_path)); @@ -1654,17 +1655,17 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderServerRedirectInIframe) { // count as an "alias" for the prerendered page. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderServerRedirectToHttpsInIframe) { - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, net::TestServer::kLocalhost, + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); std::string redirect_path = CreateServerRedirect(https_url.spec()); - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_URL", "/" + redirect_path)); std::string replacement_path; - ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( + ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( "files/prerender/prerender_with_iframe.html", replacement_text, &replacement_path)); @@ -2130,11 +2131,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderXhrDelete) { // Checks that a top-level page which would trigger an SSL error is canceled. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLErrorTopLevel) { - net::TestServer::SSLOptions ssl_options; + net::SpawnedTestServer::SSLOptions ssl_options; ssl_options.server_certificate = - net::TestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, ssl_options, + net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, ssl_options, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); @@ -2147,19 +2148,19 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLErrorTopLevel) { // the page. Non-main-frame requests are simply cancelled if they run into // an SSL problem. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLErrorSubresource) { - net::TestServer::SSLOptions ssl_options; + net::SpawnedTestServer::SSLOptions ssl_options; ssl_options.server_certificate = - net::TestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, ssl_options, + net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, ssl_options, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL("files/prerender/image.jpeg"); - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_IMAGE_URL", https_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( + ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( "files/prerender/prerender_with_image.html", replacement_text, &replacement_path)); @@ -2171,20 +2172,20 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLErrorSubresource) { // the page. Non-main-frame requests are simply cancelled if they run into // an SSL problem. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLErrorIframe) { - net::TestServer::SSLOptions ssl_options; + net::SpawnedTestServer::SSLOptions ssl_options; ssl_options.server_certificate = - net::TestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, ssl_options, + net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, ssl_options, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL( "files/prerender/prerender_embedded_content.html"); - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_URL", https_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( + ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( "files/prerender/prerender_with_iframe.html", replacement_text, &replacement_path)); @@ -2222,10 +2223,10 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // Checks that a top-level page which would normally request an SSL client // certificate will never be seen since it's an https top-level resource. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLClientCertTopLevel) { - net::TestServer::SSLOptions ssl_options; + net::SpawnedTestServer::SSLOptions ssl_options; ssl_options.request_client_certificate = true; - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, ssl_options, + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, ssl_options, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); @@ -2236,18 +2237,18 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLClientCertTopLevel) { // subresource will cancel the prerendered page. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLClientCertSubresource) { - net::TestServer::SSLOptions ssl_options; + net::SpawnedTestServer::SSLOptions ssl_options; ssl_options.request_client_certificate = true; - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, ssl_options, + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, ssl_options, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL("files/prerender/image.jpeg"); - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_IMAGE_URL", https_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( + ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( "files/prerender/prerender_with_image.html", replacement_text, &replacement_path)); @@ -2259,19 +2260,19 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // Checks that an SSL Client Certificate request that originates from an // iframe will cancel the prerendered page. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLClientCertIframe) { - net::TestServer::SSLOptions ssl_options; + net::SpawnedTestServer::SSLOptions ssl_options; ssl_options.request_client_certificate = true; - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, ssl_options, + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, ssl_options, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL https_url = https_server.GetURL( "files/prerender/prerender_embedded_content.html"); - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_URL", https_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( + ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( "files/prerender/prerender_with_iframe.html", replacement_text, &replacement_path)); @@ -2318,11 +2319,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSafeBrowsingSubresource) { GURL image_url = test_server()->GetURL("files/prerender/image.jpeg"); GetFakeSafeBrowsingDatabaseManager()->SetThreatTypeForUrl( image_url, SB_THREAT_TYPE_URL_MALWARE); - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_IMAGE_URL", image_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( + ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( "files/prerender/prerender_with_image.html", replacement_text, &replacement_path)); @@ -2337,11 +2338,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSafeBrowsingIframe) { "files/prerender/prerender_embedded_content.html"); GetFakeSafeBrowsingDatabaseManager()->SetThreatTypeForUrl( iframe_url, SB_THREAT_TYPE_URL_MALWARE); - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_URL", iframe_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( + ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( "files/prerender/prerender_with_iframe.html", replacement_text, &replacement_path)); @@ -2749,11 +2750,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, TabsApi) { IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelSubresourceUnsupportedScheme) { GURL image_url = GURL("invalidscheme://www.google.com/test.jpg"); - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_IMAGE_URL", image_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( + ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( "files/prerender/prerender_with_image.html", replacement_text, &replacement_path)); @@ -2766,11 +2767,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelSubresourceRedirectUnsupportedScheme) { GURL image_url = test_server()->GetURL( CreateServerRedirect("invalidscheme://www.google.com/test.jpg")); - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_IMAGE_URL", image_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( + ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( "files/prerender/prerender_with_image.html", replacement_text, &replacement_path)); diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc index 73053ac..a8fc2a9 100644 --- a/chrome/browser/printing/printing_layout_browsertest.cc +++ b/chrome/browser/printing/printing_layout_browsertest.cc @@ -25,7 +25,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "printing/image.h" #include "printing/printing_test.h" diff --git a/chrome/browser/referrer_policy_browsertest.cc b/chrome/browser/referrer_policy_browsertest.cc index 0b9f40f..401f221 100644 --- a/chrome/browser/referrer_policy_browsertest.cc +++ b/chrome/browser/referrer_policy_browsertest.cc @@ -18,7 +18,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" // GTK requires a X11-level mouse event to open a context menu correctly. @@ -47,13 +47,15 @@ class ReferrerPolicyTest : public InProcessBrowserTest { virtual ~ReferrerPolicyTest() {} virtual void SetUp() OVERRIDE { - test_server_.reset(new net::TestServer(net::TestServer::TYPE_HTTP, - net::TestServer::kLocalhost, - base::FilePath(kDocRoot))); + test_server_.reset(new net::SpawnedTestServer( + net::SpawnedTestServer::TYPE_HTTP, + net::SpawnedTestServer::kLocalhost, + base::FilePath(kDocRoot))); ASSERT_TRUE(test_server_->Start()); - ssl_test_server_.reset(new net::TestServer(net::TestServer::TYPE_HTTPS, - net::TestServer::kLocalhost, - base::FilePath(kDocRoot))); + ssl_test_server_.reset(new net::SpawnedTestServer( + net::SpawnedTestServer::TYPE_HTTPS, + net::SpawnedTestServer::kLocalhost, + base::FilePath(kDocRoot))); ASSERT_TRUE(ssl_test_server_->Start()); InProcessBrowserTest::SetUp(); @@ -122,7 +124,7 @@ class ReferrerPolicyTest : public InProcessBrowserTest { WebKit::WebMouseEvent::Button button, ExpectedReferrer expected_referrer) { GURL start_url; - net::TestServer* start_server = + net::SpawnedTestServer* start_server = start_on_https ? ssl_test_server_.get() : test_server_.get(); start_url = start_server->GetURL( std::string("files/referrer-policy-start.html?") + @@ -173,8 +175,8 @@ class ReferrerPolicyTest : public InProcessBrowserTest { return start_url; } - scoped_ptr<net::TestServer> test_server_; - scoped_ptr<net::TestServer> ssl_test_server_; + scoped_ptr<net::SpawnedTestServer> test_server_; + scoped_ptr<net::SpawnedTestServer> ssl_test_server_; }; // The basic behavior of referrer policies is covered by layout tests in diff --git a/chrome/browser/repost_form_warning_browsertest.cc b/chrome/browser/repost_form_warning_browsertest.cc index 25df39d..3ab6a8e 100644 --- a/chrome/browser/repost_form_warning_browsertest.cc +++ b/chrome/browser/repost_form_warning_browsertest.cc @@ -15,7 +15,7 @@ #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_navigation_observer.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" typedef InProcessBrowserTest RepostFormWarningTest; diff --git a/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc b/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc index 8140105..7ead024 100644 --- a/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc +++ b/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc @@ -9,12 +9,12 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "net/test/python_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" LocalSafeBrowsingTestServer::LocalSafeBrowsingTestServer( const base::FilePath& data_file) - : net::LocalTestServer(net::TestServer::TYPE_HTTP, - net::TestServer::kLocalhost, + : net::LocalTestServer(net::SpawnedTestServer::TYPE_HTTP, + net::SpawnedTestServer::kLocalhost, base::FilePath()), data_file_(data_file) { } diff --git a/chrome/browser/safe_browsing/local_two_phase_testserver.cc b/chrome/browser/safe_browsing/local_two_phase_testserver.cc index 567bb2a..3b7ab5b 100644 --- a/chrome/browser/safe_browsing/local_two_phase_testserver.cc +++ b/chrome/browser/safe_browsing/local_two_phase_testserver.cc @@ -9,11 +9,11 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "net/test/python_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" LocalTwoPhaseTestServer::LocalTwoPhaseTestServer() - : net::LocalTestServer(net::TestServer::TYPE_HTTP, - net::TestServer::kLocalhost, + : net::LocalTestServer(net::SpawnedTestServer::TYPE_HTTP, + net::SpawnedTestServer::kLocalhost, base::FilePath()) { } diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc index 9a312db..9afe945 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc @@ -747,8 +747,8 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ReportingDisabled) { browser()->profile()->GetPrefs()->SetBoolean( prefs::kSafeBrowsingReportingEnabled, true); - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, net::TestServer::kLocalhost, + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL url = https_server.GetURL(kEmptyPage); diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index d25ebe4..e96f565 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -207,7 +207,7 @@ class SafeBrowsingServerTest : public InProcessBrowserTest { return database_manager()->safe_browsing_thread_->message_loop(); } - const net::TestServer& test_server() const { + const net::SpawnedTestServer& test_server() const { return *test_server_; } @@ -264,7 +264,7 @@ class SafeBrowsingServerTest : public InProcessBrowserTest { private: SafeBrowsingService* safe_browsing_service_; - scoped_ptr<net::TestServer> test_server_; + scoped_ptr<net::SpawnedTestServer> test_server_; // Protects all variables below since they are read on UI thread // but updated on IO thread or safebrowsing thread. @@ -370,7 +370,7 @@ class SafeBrowsingServerTestHelper // Calls test server to fetch database for verification. net::URLRequestStatus::Status FetchDBToVerify( - const net::TestServer& test_server, + const net::SpawnedTestServer& test_server, int test_step) { // TODO(lzheng): Remove chunk_type=add once it is not needed by the server. std::string path = base::StringPrintf( @@ -381,7 +381,7 @@ class SafeBrowsingServerTestHelper // Calls test server to fetch URLs for verification. net::URLRequestStatus::Status FetchUrlsToVerify( - const net::TestServer& test_server, + const net::SpawnedTestServer& test_server, int test_step) { std::string path = base::StringPrintf( "%s?client=chromium&appver=1.0&pver=2.2&test_step=%d", @@ -393,7 +393,7 @@ class SafeBrowsingServerTestHelper // bad URL that server expects test to fetch full hash but the test didn't, // this verification will fail. net::URLRequestStatus::Status VerifyTestComplete( - const net::TestServer& test_server, + const net::SpawnedTestServer& test_server, int test_step) { std::string path = base::StringPrintf( "%s?test_step=%d", kTestCompletePath, test_step); diff --git a/chrome/browser/search_engines/template_url_fetcher_unittest.cc b/chrome/browser/search_engines/template_url_fetcher_unittest.cc index bdef3dd..5ace411 100644 --- a/chrome/browser/search_engines/template_url_fetcher_unittest.cc +++ b/chrome/browser/search_engines/template_url_fetcher_unittest.cc @@ -9,14 +9,14 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_fetcher.h" -#include "chrome/browser/search_engines/template_url_fetcher_factory.h" #include "chrome/browser/search_engines/template_url_fetcher_callbacks.h" +#include "chrome/browser/search_engines/template_url_fetcher_factory.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_test_util.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/testing_profile.h" #include "googleurl/src/gurl.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" class TemplateURLFetcherTest; @@ -78,7 +78,7 @@ class TemplateURLFetcherTest : public testing::Test { void WaitForDownloadToFinish(); TemplateURLServiceTestUtil test_util_; - net::TestServer test_server_; + net::SpawnedTestServer test_server_; // The last TemplateURL to come from a callback. scoped_ptr<TemplateURL> last_callback_template_url_; @@ -108,8 +108,8 @@ void TemplateURLFetcherTestCallbacks::ConfirmAddSearchProvider( } TemplateURLFetcherTest::TemplateURLFetcherTest() - : test_server_(net::TestServer::TYPE_HTTP, - net::TestServer::kLocalhost, + : test_server_(net::SpawnedTestServer::TYPE_HTTP, + net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))), callbacks_destroyed_(0), add_provider_called_(0), diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc index d57e6c1..fae8633 100644 --- a/chrome/browser/sessions/tab_restore_browsertest.cc +++ b/chrome/browser/sessions/tab_restore_browsertest.cc @@ -28,7 +28,7 @@ #include "content/public/browser/web_contents.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h" class TabRestoreTest : public InProcessBrowserTest { diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index d4afe0f..61d28fb 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -42,7 +42,7 @@ #include "net/base/net_errors.h" #include "net/base/test_data_directory.h" #include "net/cert/cert_status_flags.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #if defined(USE_NSS) #include "net/cert/nss_cert_database.h" @@ -94,16 +94,16 @@ class ProvisionalLoadWaiter : public content::WebContentsObserver { class SSLUITest : public InProcessBrowserTest { public: SSLUITest() - : https_server_(net::TestServer::TYPE_HTTPS, + : https_server_(net::SpawnedTestServer::TYPE_HTTPS, SSLOptions(SSLOptions::CERT_OK), base::FilePath(kDocRoot)), - https_server_expired_(net::TestServer::TYPE_HTTPS, + https_server_expired_(net::SpawnedTestServer::TYPE_HTTPS, SSLOptions(SSLOptions::CERT_EXPIRED), base::FilePath(kDocRoot)), - https_server_mismatched_(net::TestServer::TYPE_HTTPS, + https_server_mismatched_(net::SpawnedTestServer::TYPE_HTTPS, SSLOptions(SSLOptions::CERT_MISMATCHED_NAME), base::FilePath(kDocRoot)), - wss_server_expired_(net::TestServer::TYPE_WSS, + wss_server_expired_(net::SpawnedTestServer::TYPE_WSS, SSLOptions(SSLOptions::CERT_EXPIRED), net::GetWebSocketTestDataDirectory()) {} @@ -225,16 +225,16 @@ class SSLUITest : public InProcessBrowserTest { const std::string& original_file_path, const net::HostPortPair& host_port_pair, std::string* replacement_path) { - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( make_pair("REPLACE_WITH_HOST_AND_PORT", host_port_pair.ToString())); - return net::TestServer::GetFilePathWithReplacements( + return net::SpawnedTestServer::GetFilePathWithReplacements( original_file_path, replacement_text, replacement_path); } - static bool GetTopFramePath(const net::TestServer& http_server, - const net::TestServer& good_https_server, - const net::TestServer& bad_https_server, + static bool GetTopFramePath(const net::SpawnedTestServer& http_server, + const net::SpawnedTestServer& good_https_server, + const net::SpawnedTestServer& bad_https_server, std::string* top_frame_path) { // The "frame_left.html" page contained in the top_frame.html page contains // <a href>'s to three different servers. This sets up all of the @@ -245,7 +245,7 @@ class SSLUITest : public InProcessBrowserTest { GURL bad_https_url = bad_https_server.GetURL( "files/ssl/bad_iframe.html"); - std::vector<net::TestServer::StringPair> replacement_text_frame_left; + std::vector<net::SpawnedTestServer::StringPair> replacement_text_frame_left; replacement_text_frame_left.push_back( make_pair("REPLACE_WITH_HTTP_PAGE", http_url.spec())); replacement_text_frame_left.push_back( @@ -253,56 +253,57 @@ class SSLUITest : public InProcessBrowserTest { replacement_text_frame_left.push_back( make_pair("REPLACE_WITH_BAD_HTTPS_PAGE", bad_https_url.spec())); std::string frame_left_path; - if (!net::TestServer::GetFilePathWithReplacements( + if (!net::SpawnedTestServer::GetFilePathWithReplacements( "frame_left.html", replacement_text_frame_left, &frame_left_path)) return false; // Substitute the generated frame_left URL into the top_frame page. - std::vector<net::TestServer::StringPair> replacement_text_top_frame; + std::vector<net::SpawnedTestServer::StringPair> replacement_text_top_frame; replacement_text_top_frame.push_back( make_pair("REPLACE_WITH_FRAME_LEFT_PATH", frame_left_path)); - return net::TestServer::GetFilePathWithReplacements( + return net::SpawnedTestServer::GetFilePathWithReplacements( "files/ssl/top_frame.html", replacement_text_top_frame, top_frame_path); } static bool GetPageWithUnsafeWorkerPath( - const net::TestServer& expired_https_server, + const net::SpawnedTestServer& expired_https_server, std::string* page_with_unsafe_worker_path) { // Get the "imported.js" URL from the expired https server and // substitute it into the unsafe_worker.js file. GURL imported_js_url = expired_https_server.GetURL("files/ssl/imported.js"); - std::vector<net::TestServer::StringPair> replacement_text_for_unsafe_worker; + std::vector<net::SpawnedTestServer::StringPair> + replacement_text_for_unsafe_worker; replacement_text_for_unsafe_worker.push_back( make_pair("REPLACE_WITH_IMPORTED_JS_URL", imported_js_url.spec())); std::string unsafe_worker_path; - if (!net::TestServer::GetFilePathWithReplacements( + if (!net::SpawnedTestServer::GetFilePathWithReplacements( "unsafe_worker.js", replacement_text_for_unsafe_worker, &unsafe_worker_path)) return false; // Now, substitute this into the page with unsafe worker. - std::vector<net::TestServer::StringPair> + std::vector<net::SpawnedTestServer::StringPair> replacement_text_for_page_with_unsafe_worker; replacement_text_for_page_with_unsafe_worker.push_back( make_pair("REPLACE_WITH_UNSAFE_WORKER_PATH", unsafe_worker_path)); - return net::TestServer::GetFilePathWithReplacements( + return net::SpawnedTestServer::GetFilePathWithReplacements( "files/ssl/page_with_unsafe_worker.html", replacement_text_for_page_with_unsafe_worker, page_with_unsafe_worker_path); } - net::TestServer https_server_; - net::TestServer https_server_expired_; - net::TestServer https_server_mismatched_; - net::TestServer wss_server_expired_; + net::SpawnedTestServer https_server_; + net::SpawnedTestServer https_server_expired_; + net::SpawnedTestServer https_server_mismatched_; + net::SpawnedTestServer wss_server_expired_; private: - typedef net::TestServer::SSLOptions SSLOptions; + typedef net::SpawnedTestServer::SSLOptions SSLOptions; DISALLOW_COPY_AND_ASSIGN(SSLUITest); }; @@ -664,12 +665,13 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestWSSClientCert) { NULL)); // Start WebSocket test server with TLS and client cert authentication. - net::TestServer::SSLOptions options(net::TestServer::SSLOptions::CERT_OK); + net::SpawnedTestServer::SSLOptions options( + net::SpawnedTestServer::SSLOptions::CERT_OK); options.request_client_certificate = true; base::FilePath ca_path = net::GetTestCertsDirectory().Append( FILE_PATH_LITERAL("websocket_cacert.pem")); options.client_authorities.push_back(ca_path); - net::TestServer wss_server(net::TestServer::TYPE_WSS, + net::SpawnedTestServer wss_server(net::SpawnedTestServer::TYPE_WSS, options, net::GetWebSocketTestDataDirectory()); ASSERT_TRUE(wss_server.Start()); diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index 4d0e90e..accdbfe 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -48,7 +48,7 @@ #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_service.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/browser/tab_contents/view_source_browsertest.cc b/chrome/browser/tab_contents/view_source_browsertest.cc index 7eb3f51..e90fd87 100644 --- a/chrome/browser/tab_contents/view_source_browsertest.cc +++ b/chrome/browser/tab_contents/view_source_browsertest.cc @@ -17,7 +17,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "googleurl/src/gurl.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" namespace { const char kTestHtml[] = "files/viewsource/test.html"; diff --git a/chrome/browser/translate/translate_browsertest.cc b/chrome/browser/translate/translate_browsertest.cc index 204fd0db..450d0b3 100644 --- a/chrome/browser/translate/translate_browsertest.cc +++ b/chrome/browser/translate/translate_browsertest.cc @@ -19,7 +19,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" #include "net/http/http_status_code.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher_delegate.h" @@ -38,7 +38,7 @@ const char kElementMainScriptPath[] = "pseudo_element_main.js"; class TranslateBrowserTest : public InProcessBrowserTest { public: TranslateBrowserTest() - : https_server_(net::TestServer::TYPE_HTTPS, + : https_server_(net::SpawnedTestServer::TYPE_HTTPS, SSLOptions(SSLOptions::CERT_OK), base::FilePath(kTranslateRoot)) {} @@ -58,9 +58,9 @@ class TranslateBrowserTest : public InProcessBrowserTest { } private: - net::TestServer https_server_; + net::SpawnedTestServer https_server_; - typedef net::TestServer::SSLOptions SSLOptions; + typedef net::SpawnedTestServer::SSLOptions SSLOptions; DISALLOW_COPY_AND_ASSIGN(TranslateBrowserTest); }; diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 4a4d1fc0..1083616 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -69,7 +69,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/dns/mock_host_resolver.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_MACOSX) @@ -380,9 +380,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ReloadThenCancelBeforeUnload) { IN_PROC_BROWSER_TEST_F(BrowserTest, SingleBeforeUnloadAfterRedirect) { // Create HTTP and HTTPS servers for cross-site transition. ASSERT_TRUE(test_server()->Start()); - net::TestServer https_test_server(net::TestServer::TYPE_HTTPS, - net::TestServer::kLocalhost, - base::FilePath(kDocRoot)); + net::SpawnedTestServer https_test_server(net::SpawnedTestServer::TYPE_HTTPS, + net::SpawnedTestServer::kLocalhost, + base::FilePath(kDocRoot)); ASSERT_TRUE(https_test_server.Start()); // Temporarily replace ContentBrowserClient with one that will cause a @@ -606,9 +606,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NullOpenerRedirectForksProcess) { // Create http and https servers for a cross-site transition. ASSERT_TRUE(test_server()->Start()); - net::TestServer https_test_server(net::TestServer::TYPE_HTTPS, - net::TestServer::kLocalhost, - base::FilePath(kDocRoot)); + net::SpawnedTestServer https_test_server(net::SpawnedTestServer::TYPE_HTTPS, + net::SpawnedTestServer::kLocalhost, + base::FilePath(kDocRoot)); ASSERT_TRUE(https_test_server.Start()); GURL http_url(test_server()->GetURL("files/title1.html")); GURL https_url(https_test_server.GetURL(std::string())); @@ -695,9 +695,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OtherRedirectsDontForkProcess) { // Create http and https servers for a cross-site transition. ASSERT_TRUE(test_server()->Start()); - net::TestServer https_test_server(net::TestServer::TYPE_HTTPS, - net::TestServer::kLocalhost, - base::FilePath(kDocRoot)); + net::SpawnedTestServer https_test_server(net::SpawnedTestServer::TYPE_HTTPS, + net::SpawnedTestServer::kLocalhost, + base::FilePath(kDocRoot)); ASSERT_TRUE(https_test_server.Start()); GURL http_url(test_server()->GetURL("files/title1.html")); GURL https_url(https_test_server.GetURL(std::string())); @@ -810,9 +810,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttps) { CommandUpdater* command_updater = browser()->command_controller()->command_updater(); - net::TestServer test_server(net::TestServer::TYPE_HTTPS, - net::TestServer::kLocalhost, - base::FilePath(kDocRoot)); + net::SpawnedTestServer test_server(net::SpawnedTestServer::TYPE_HTTPS, + net::SpawnedTestServer::kLocalhost, + base::FilePath(kDocRoot)); ASSERT_TRUE(test_server.Start()); GURL https_url(test_server.GetURL("/")); ASSERT_TRUE(https_url.SchemeIs(chrome::kHttpsScheme)); @@ -824,9 +824,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFtp) { CommandUpdater* command_updater = browser()->command_controller()->command_updater(); - net::TestServer test_server(net::TestServer::TYPE_FTP, - net::TestServer::kLocalhost, - base::FilePath(kDocRoot)); + net::SpawnedTestServer test_server(net::SpawnedTestServer::TYPE_FTP, + net::SpawnedTestServer::kLocalhost, + base::FilePath(kDocRoot)); ASSERT_TRUE(test_server.Start()); GURL ftp_url(test_server.GetURL(std::string())); ASSERT_TRUE(ftp_url.SchemeIs(chrome::kFtpScheme)); diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc index 946f6cb..6d36146 100644 --- a/chrome/browser/ui/browser_focus_uitest.cc +++ b/chrome/browser/ui/browser_focus_uitest.cc @@ -37,7 +37,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #if defined(TOOLKIT_VIEWS) #include "chrome/browser/ui/views/frame/browser_view.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc index 09e294d..5126195 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc @@ -10,10 +10,10 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" namespace { diff --git a/chrome/browser/ui/pdf/pdf_browsertest.cc b/chrome/browser/ui/pdf/pdf_browsertest.cc index 5d3de3c..70f7ca5 100644 --- a/chrome/browser/ui/pdf/pdf_browsertest.cc +++ b/chrome/browser/ui/pdf/pdf_browsertest.cc @@ -20,7 +20,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/clipboard/clipboard.h" #include "ui/gfx/codec/png_codec.h" @@ -44,15 +44,15 @@ class PDFBrowserTest : public InProcessBrowserTest, : snapshot_different_(true), next_dummy_search_value_(0), load_stop_notification_count_(0) { - pdf_test_server_.reset(new net::TestServer( - net::TestServer::TYPE_HTTP, - net::TestServer::kLocalhost, + pdf_test_server_.reset(new net::SpawnedTestServer( + net::SpawnedTestServer::TYPE_HTTP, + net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("pdf/test")))); } protected: // Use our own TestServer so that we can serve files from the pdf directory. - net::TestServer* pdf_test_server() { return pdf_test_server_.get(); } + net::SpawnedTestServer* pdf_test_server() { return pdf_test_server_.get(); } int load_stop_notification_count() const { return load_stop_notification_count_; @@ -206,7 +206,7 @@ class PDFBrowserTest : public InProcessBrowserTest, // How many times we've seen chrome::LOAD_STOP. int load_stop_notification_count_; - scoped_ptr<net::TestServer> pdf_test_server_; + scoped_ptr<net::SpawnedTestServer> pdf_test_server_; }; #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/search/instant_test_utils.h b/chrome/browser/ui/search/instant_test_utils.h index 2adf1ad..aa7c173 100644 --- a/chrome/browser/ui/search/instant_test_utils.h +++ b/chrome/browser/ui/search/instant_test_utils.h @@ -19,7 +19,7 @@ #include "chrome/browser/ui/search/instant_overlay_model_observer.h" #include "chrome/common/search_types.h" #include "googleurl/src/gurl.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" class InstantController; class InstantModel; @@ -57,7 +57,7 @@ class InstantTestBase { protected: InstantTestBase() : https_test_server_( - net::TestServer::TYPE_HTTPS, + net::SpawnedTestServer::TYPE_HTTPS, net::BaseTestServer::SSLOptions(), base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { } @@ -83,7 +83,7 @@ class InstantTestBase { const GURL& instant_url() const { return instant_url_; } - net::TestServer& https_test_server() { return https_test_server_; } + net::SpawnedTestServer& https_test_server() { return https_test_server_; } void KillInstantRenderView(); @@ -129,7 +129,7 @@ class InstantTestBase { Browser* browser_; // HTTPS Testing server, started on demand. - net::TestServer https_test_server_; + net::SpawnedTestServer https_test_server_; DISALLOW_COPY_AND_ASSIGN(InstantTestBase); }; diff --git a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc index cc55a36..e7451b7 100644 --- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc @@ -15,12 +15,12 @@ #include "chrome/browser/ui/views/find_bar_host.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/views/focus/focus_manager.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index 7093cef..8c802e9 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc @@ -399,13 +399,13 @@ content::WebUIMessageHandler* NetInternalsTest::GetMockMessageHandler() { GURL NetInternalsTest::CreatePrerenderLoaderUrl( const GURL& prerender_url) { EXPECT_TRUE(StartTestServer()); - std::vector<net::TestServer::StringPair> replacement_text; + std::vector<net::SpawnedTestServer::StringPair> replacement_text; replacement_text.push_back( make_pair("REPLACE_WITH_PRERENDER_URL", prerender_url.spec())); replacement_text.push_back( make_pair("REPLACE_WITH_DESTINATION_URL", prerender_url.spec())); std::string replacement_path; - EXPECT_TRUE(net::TestServer::GetFilePathWithReplacements( + EXPECT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( "files/prerender/prerender_loader.html", replacement_text, &replacement_path)); |