diff options
164 files changed, 1677 insertions, 1973 deletions
diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm index 4a4794c..bd36bb6 100644 --- a/chrome/browser/app_controller_mac_browsertest.mm +++ b/chrome/browser/app_controller_mac_browsertest.mm @@ -371,7 +371,7 @@ class AppControllerOpenShortcutBrowserTest : public InProcessBrowserTest { method_exchangeImplementations(original, destination); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); g_open_shortcut_url = embedded_test_server()->GetURL("/simple.html"); } @@ -395,7 +395,7 @@ class AppControllerReplaceNTPBrowserTest : public InProcessBrowserTest { AppControllerReplaceNTPBrowserTest() {} void SetUpInProcessBrowserTestFixture() override { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); } void SetUpCommandLine(base::CommandLine* command_line) override { @@ -633,7 +633,7 @@ class AppControllerHandoffBrowserTest : public InProcessBrowserTest { // switches between browser windows, the correct URL is being passed to the // Handoff. IN_PROC_BROWSER_TEST_F(AppControllerHandoffBrowserTest, TestHandoffURLs) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); EXPECT_EQ(g_handoff_url, GURL(url::kAboutBlankURL)); // Test that navigating to a URL updates the handoff URL. diff --git a/chrome/browser/apps/drive/drive_app_converter_browsertest.cc b/chrome/browser/apps/drive/drive_app_converter_browsertest.cc index 890dec9..7cdef79 100644 --- a/chrome/browser/apps/drive/drive_app_converter_browsertest.cc +++ b/chrome/browser/apps/drive/drive_app_converter_browsertest.cc @@ -48,7 +48,7 @@ class DriveAppConverterTest : public ExtensionBrowserTest { base::FilePath test_data_dir; PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir); embedded_test_server()->ServeFilesFromDirectory(test_data_dir); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); } void InstallAndWaitFinish(const drive::DriveAppInfo& drive_app) { diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc index 0ebf5ee..337b21f 100644 --- a/chrome/browser/apps/guest_view/web_view_browsertest.cc +++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc @@ -571,12 +571,9 @@ class WebViewTest : public extensions::PlatformAppBrowserTest { // Helper to load interstitial page in a <webview>. void InterstitialTeardownTestHelper() { // Start a HTTPS server so we can load an interstitial page inside guest. - net::SpawnedTestServer::SSLOptions ssl_options; - ssl_options.server_certificate = - net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, ssl_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); net::HostPortPair host_and_port = https_server.host_port_pair(); diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index b552277..e975412 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -103,7 +103,7 @@ class AutofillTest : public InProcessBrowserTest { // Don't want Keychain coming up on Mac. test::DisableSystemServices(browser()->profile()->GetPrefs()); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); InProcessBrowserTest::SetUpOnMainThread(); } diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc index e8d4b4e..c8b9980 100644 --- a/chrome/browser/autofill/autofill_interactive_uitest.cc +++ b/chrome/browser/autofill/autofill_interactive_uitest.cc @@ -159,7 +159,7 @@ class AutofillInteractiveTest : public InProcessBrowserTest { reset_mouse = gfx::Point(reset_mouse.x() + 5, reset_mouse.y() + 5); ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(reset_mouse)); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); InProcessBrowserTest::SetUpOnMainThread(); } diff --git a/chrome/browser/banners/app_banner_data_fetcher_browsertest.cc b/chrome/browser/banners/app_banner_data_fetcher_browsertest.cc index e803089..b37df5f 100644 --- a/chrome/browser/banners/app_banner_data_fetcher_browsertest.cc +++ b/chrome/browser/banners/app_banner_data_fetcher_browsertest.cc @@ -65,7 +65,7 @@ class AppBannerDataFetcherBrowserTest : public InProcessBrowserTest, void SetUpOnMainThread() override { AppBannerSettingsHelper::SetEngagementWeights(1, 1); AppBannerSettingsHelper::SetTotalEngagementToTrigger(2); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); InProcessBrowserTest::SetUpOnMainThread(); } diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index 2cc8168..73c85e0 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -353,7 +353,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_NormalKeyEvents) { "U 65 0 false false false false" } }, }; - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); GURL url = embedded_test_server()->GetURL(kTestingPage); @@ -447,7 +447,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_CtrlKeyEvents) { "U 17 0 true false false false" } }; - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); GURL url = embedded_test_server()->GetURL(kTestingPage); @@ -493,7 +493,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_CommandKeyEvents) { "U 91 0 false false false true" } }; - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); GURL url = embedded_test_server()->GetURL(kTestingPage); @@ -593,7 +593,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_AccessKeys) { #endif #endif - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); GURL url = embedded_test_server()->GetURL(kTestingPage); @@ -661,7 +661,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_AccessKeys) { #define MAYBE_ReservedAccelerators ReservedAccelerators #endif IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_ReservedAccelerators) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); GURL url = embedded_test_server()->GetURL(kTestingPage); @@ -761,7 +761,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, EditorKeyBindings) { "U 17 0 true false false false" } }; - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); GURL url = embedded_test_server()->GetURL(kTestingPage); @@ -799,7 +799,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_PageUpDownKeys) { "U 34 0 false false false false" } }; - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); GURL url = embedded_test_server()->GetURL(kTestingPage); @@ -843,7 +843,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, FocusMenuBarByAltKey) { "U 17 0 true false false false" } }; - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); GURL url = embedded_test_server()->GetURL(kTestingPage); diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index b10a497..2097daf 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc @@ -58,6 +58,7 @@ #include "net/cert/x509_certificate.h" #include "net/http/transport_security_state.h" #include "net/test/cert_test_util.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/url_request/url_request_failed_job.h" #include "net/test/url_request/url_request_mock_http_job.h" #include "net/url_request/url_request.h" @@ -78,12 +79,12 @@ using net::URLRequestMockHTTPJob; namespace { // Path of the fake login page, when using the TestServer. -const char* const kTestServerLoginPath = "files/captive_portal/login.html"; +const char* const kTestServerLoginPath = "/captive_portal/login.html"; // Path of a page with an iframe that has a mock SSL timeout, when using the // TestServer. const char* const kTestServerIframeTimeoutPath = - "files/captive_portal/iframe_timeout.html"; + "/captive_portal/iframe_timeout.html"; // The following URLs each have two different behaviors, depending on whether // URLRequestMockCaptivePortalJobFactory is currently simulating the presence @@ -540,7 +541,7 @@ URLRequestMockCaptivePortalJobFactory::Interceptor::MaybeInterceptRequest( // Creates a server-side redirect for use with the TestServer. std::string CreateServerRedirect(const std::string& dest_url) { - const char* const kServerRedirectBase = "server-redirect?"; + const char* const kServerRedirectBase = "/server-redirect?"; return kServerRedirectBase + dest_url; } @@ -1827,9 +1828,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::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, net::SpawnedTestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); GURL url = https_server.GetURL(kTestServerIframeTimeoutPath); @@ -1867,9 +1867,9 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, Disabled) { IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, InternetConnected) { // Can't just use SetBehindCaptivePortal(false), since then there wouldn't // be a timeout. - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); SetUpCaptivePortalService(browser()->profile(), - test_server()->GetURL("nocontent")); + embedded_test_server()->GetURL("/nocontent")); SlowLoadNoCaptivePortal(browser(), captive_portal::RESULT_INTERNET_CONNECTED); } @@ -1877,14 +1877,11 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, InternetConnected) { // SSL certificate error. IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, RedirectSSLCertError) { // Need an HTTP TestServer to handle a dynamically created server redirect. - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); - net::SpawnedTestServer::SSLOptions ssl_options; - ssl_options.server_certificate = - net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, ssl_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); GURL ssl_login_url = https_server.GetURL(kTestServerLoginPath); @@ -1892,9 +1889,9 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, RedirectSSLCertError) { CaptivePortalService* captive_portal_service = CaptivePortalServiceFactory::GetForProfile(browser()->profile()); ASSERT_TRUE(captive_portal_service); - SetUpCaptivePortalService( - browser()->profile(), - test_server()->GetURL(CreateServerRedirect(ssl_login_url.spec()))); + SetUpCaptivePortalService(browser()->profile(), + embedded_test_server()->GetURL( + CreateServerRedirect(ssl_login_url.spec()))); SlowLoadNoCaptivePortal(browser(), captive_portal::RESULT_NO_RESPONSE); } @@ -1965,12 +1962,9 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, LoginFastTimeout) { // tab. IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, ShowCaptivePortalInterstitialOnCertError) { - net::SpawnedTestServer::SSLOptions https_options; - https_options.server_certificate = - net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, https_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); TabStripModel* tab_strip_model = browser()->tab_strip_model(); @@ -2053,12 +2047,9 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, // - Stopping the page load shouldn't result in any interstitials. IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, InterstitialTimerStopNavigationWhileLoading) { - net::SpawnedTestServer::SSLOptions https_options; - https_options.server_certificate = - net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, https_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); // The path does not matter. GURL cert_error_url = https_server.GetURL(kTestServerLoginPath); @@ -2110,12 +2101,9 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, // result is the same. (i.e. page load stops, no interstitials shown) IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, InterstitialTimerReloadWhileLoading) { - net::SpawnedTestServer::SSLOptions https_options; - https_options.server_certificate = - net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, https_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); // The path does not matter. GURL cert_error_url = https_server.GetURL(kTestServerLoginPath); @@ -2170,12 +2158,9 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, // interstitials should be shown. IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, InterstitialTimerNavigateAwayWhileLoading) { - net::SpawnedTestServer::SSLOptions https_options; - https_options.server_certificate = - net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, https_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); // The path does not matter. GURL cert_error_url = https_server.GetURL(kTestServerLoginPath); @@ -2240,12 +2225,9 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, IN_PROC_BROWSER_TEST_F( CaptivePortalBrowserTest, InterstitialTimerNavigateWhileLoading_EndWithSSLInterstitial) { - net::SpawnedTestServer::SSLOptions https_options; - https_options.server_certificate = - net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, https_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); // The path does not matter. GURL cert_error_url = https_server.GetURL(kTestServerLoginPath); @@ -2291,12 +2273,9 @@ IN_PROC_BROWSER_TEST_F( IN_PROC_BROWSER_TEST_F( CaptivePortalBrowserTest, InterstitialTimerNavigateWhileLoading_EndWithCaptivePortalInterstitial) { - net::SpawnedTestServer::SSLOptions https_options; - https_options.server_certificate = - net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, https_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); // The path does not matter. GURL cert_error_url = https_server.GetURL(kTestServerLoginPath); @@ -2349,14 +2328,11 @@ IN_PROC_BROWSER_TEST_F( // tab. The user then logs in and the page with the error is reloaded. IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, SSLCertErrorLogin) { // Need an HTTP TestServer to handle a dynamically created server redirect. - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); - net::SpawnedTestServer::SSLOptions https_options; - https_options.server_certificate = - net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, https_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); // Set SSL interstitial delay to zero so that a captive portal result can not @@ -2774,12 +2750,10 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) { // captive portal is found, and then the user logs in before the original page // times out. IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, HttpToHttpsRedirectLogin) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); SlowLoadBehindCaptivePortal( - browser(), - true, - test_server()->GetURL(CreateServerRedirect(kMockHttpsUrl)), - 1, + browser(), true, + embedded_test_server()->GetURL(CreateServerRedirect(kMockHttpsUrl)), 1, 1); Login(browser(), 1, 0); FailLoadsAfterLogin(browser(), 1); @@ -2788,8 +2762,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::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, net::SpawnedTestServer::kLocalhost, + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.AddDefaultHandlers( base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); diff --git a/chrome/browser/chrome_content_browser_client_browsertest.cc b/chrome/browser/chrome_content_browser_client_browsertest.cc index 3a2e65f..af7c13b 100644 --- a/chrome/browser/chrome_content_browser_client_browsertest.cc +++ b/chrome/browser/chrome_content_browser_client_browsertest.cc @@ -12,6 +12,7 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" namespace content { @@ -102,8 +103,8 @@ class ChromeContentBrowserClientSitePerProcessTest // such as http://crbug.com/164223. IN_PROC_BROWSER_TEST_F(ChromeContentBrowserClientSitePerProcessTest, SitePerProcessNavigation) { - ASSERT_TRUE(test_server()->Start()); - const GURL url(test_server()->GetURL("files/title1.html")); + ASSERT_TRUE(embedded_test_server()->Start()); + const GURL url(embedded_test_server()->GetURL("/title1.html")); ui_test_utils::NavigateToURL(browser(), url); NavigationEntry* entry = GetLastCommittedEntry(); diff --git a/chrome/browser/chrome_security_exploit_browsertest.cc b/chrome/browser/chrome_security_exploit_browsertest.cc index 4486a02..00ad2b7 100644 --- a/chrome/browser/chrome_security_exploit_browsertest.cc +++ b/chrome/browser/chrome_security_exploit_browsertest.cc @@ -18,6 +18,7 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "net/test/embedded_test_server/embedded_test_server.h" // The goal of these tests is to "simulate" exploited renderer processes, which // can send arbitrary IPC messages and confuse browser process internal state, @@ -31,19 +32,14 @@ class ChromeSecurityExploitBrowserTest : public InProcessBrowserTest { ~ChromeSecurityExploitBrowserTest() override {} void SetUpCommandLine(base::CommandLine* command_line) override { - ASSERT_TRUE(test_server()->Start()); - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); - ASSERT_TRUE(https_server.Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Add a host resolver rule to map all outgoing requests to the test server. // This allows us to use "real" hostnames in URLs, which we can use to // create arbitrary SiteInstances. command_line->AppendSwitchASCII( switches::kHostResolverRules, - "MAP * " + test_server()->host_port_pair().ToString() + + "MAP * " + embedded_test_server()->host_port_pair().ToString() + ",EXCLUDE localhost"); // Since we assume exploited renderer process, it can bypass the same origin @@ -59,7 +55,7 @@ IN_PROC_BROWSER_TEST_F(ChromeSecurityExploitBrowserTest, ChromeExtensionResources) { // Load a page that requests a chrome-extension:// image through XHR. We // expect this load to fail, as it is an illegal request. - GURL foo("http://foo.com/files/chrome_extension_resource.html"); + GURL foo("http://foo.com/chrome_extension_resource.html"); content::DOMMessageQueue msg_queue; diff --git a/chrome/browser/chrome_service_worker_browsertest.cc b/chrome/browser/chrome_service_worker_browsertest.cc index 3a20420..e6c32fd 100644 --- a/chrome/browser/chrome_service_worker_browsertest.cc +++ b/chrome/browser/chrome_service_worker_browsertest.cc @@ -56,7 +56,7 @@ IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerTest, "HTTP/1.1 200 OK\nContent-Type: text/javascript"); embedded_test_server()->ServeFilesFromDirectory(service_worker_dir_.path()); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::ServiceWorkerContext* sw_context = content::BrowserContext::GetDefaultStoragePartition(browser()->profile()) @@ -84,7 +84,7 @@ IN_PROC_BROWSER_TEST_F(ChromeServiceWorkerTest, WriteFile(FILE_PATH_LITERAL("test.html"), ""); embedded_test_server()->ServeFilesFromDirectory(service_worker_dir_.path()); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); Browser* incognito = CreateIncognitoBrowser(); content::ServiceWorkerContext* sw_context = diff --git a/chrome/browser/chrome_site_per_process_browsertest.cc b/chrome/browser/chrome_site_per_process_browsertest.cc index b632c5b..11e2c84 100644 --- a/chrome/browser/chrome_site_per_process_browsertest.cc +++ b/chrome/browser/chrome_site_per_process_browsertest.cc @@ -32,7 +32,7 @@ class ChromeSitePerProcessTest : public InProcessBrowserTest { void SetUpOnMainThread() override { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::SetupCrossSiteRedirector(embedded_test_server()); } diff --git a/chrome/browser/chrome_switches_browsertest.cc b/chrome/browser/chrome_switches_browsertest.cc index c936004..872e2d8 100644 --- a/chrome/browser/chrome_switches_browsertest.cc +++ b/chrome/browser/chrome_switches_browsertest.cc @@ -10,18 +10,18 @@ #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/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" class HostRulesTest : public InProcessBrowserTest { protected: HostRulesTest() {} void SetUpCommandLine(base::CommandLine* command_line) override { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Map all hosts to our local server. - std::string host_rule( - "MAP * " + test_server()->host_port_pair().ToString()); + std::string host_rule("MAP * " + + embedded_test_server()->host_port_pair().ToString()); command_line->AppendSwitchASCII(switches::kHostRules, host_rule); // Use no proxy or otherwise this test will fail on a machine that has a // proxy configured. @@ -34,7 +34,7 @@ class HostRulesTest : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(HostRulesTest, TestMap) { // Go to the empty page using www.google.com as the host. - GURL local_url = test_server()->GetURL("files/empty.html"); + GURL local_url = embedded_test_server()->GetURL("/empty.html"); GURL test_url(std::string("http://www.google.com") + local_url.path()); ui_test_utils::NavigateToURL(browser(), test_url); diff --git a/chrome/browser/chromeos/app_mode/fake_cws.cc b/chrome/browser/chromeos/app_mode/fake_cws.cc index e8c798d..a1f25c4 100644 --- a/chrome/browser/chromeos/app_mode/fake_cws.cc +++ b/chrome/browser/chromeos/app_mode/fake_cws.cc @@ -18,7 +18,6 @@ #include "net/test/embedded_test_server/embedded_test_server.h" using net::test_server::BasicHttpResponse; -using net::test_server::EmbeddedTestServer; using net::test_server::HttpRequest; using net::test_server::HttpResponse; @@ -76,7 +75,7 @@ FakeCWS::FakeCWS() : update_check_count_(0) { FakeCWS::~FakeCWS() { } -void FakeCWS::Init(EmbeddedTestServer* embedded_test_server) { +void FakeCWS::Init(net::EmbeddedTestServer* embedded_test_server) { has_update_template_ = kAppHasUpdateTemplate; no_update_template_ = kAppNoUpdateTemplate; update_check_end_point_ = "/update_check.xml"; @@ -87,7 +86,7 @@ void FakeCWS::Init(EmbeddedTestServer* embedded_test_server) { base::Bind(&FakeCWS::HandleRequest, base::Unretained(this))); } -void FakeCWS::InitAsPrivateStore(EmbeddedTestServer* embedded_test_server, +void FakeCWS::InitAsPrivateStore(net::EmbeddedTestServer* embedded_test_server, const std::string& update_check_end_point) { has_update_template_ = kPrivateStoreAppHasUpdateTemplate; no_update_template_ = kAppNoUpdateTemplate; diff --git a/chrome/browser/chromeos/app_mode/fake_cws.h b/chrome/browser/chromeos/app_mode/fake_cws.h index baade20..02ed184 100644 --- a/chrome/browser/chromeos/app_mode/fake_cws.h +++ b/chrome/browser/chromeos/app_mode/fake_cws.h @@ -26,15 +26,14 @@ class FakeCWS { // Initializes as CWS request handler and overrides app gallery command line // switches. - void Init(net::test_server::EmbeddedTestServer* embedded_test_server); + void Init(net::EmbeddedTestServer* embedded_test_server); // Initializes as a private store handler using the given server and URL end // point. Private store does not override app gallery command lines and use a // slightly different template (as documented on // https://developer.chrome.com/extensions/autoupdate). - void InitAsPrivateStore( - net::test_server::EmbeddedTestServer* embedded_test_server, - const std::string& update_check_end_point); + void InitAsPrivateStore(net::EmbeddedTestServer* embedded_test_server, + const std::string& update_check_end_point); // Sets up the update check response with has_update template. void SetUpdateCrx(const std::string& app_id, diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc index 5a2ff7e..e14e3eb 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc @@ -517,7 +517,7 @@ void FileManagerBrowserTestBase::SetUpOnMainThread() { if (GetGuestModeParam() != IN_GUEST_MODE) { // Install the web server to serve the mocked share dialog. - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); const GURL share_url_base(embedded_test_server()->GetURL( "/chromeos/file_manager/share_dialog_mock/index.html")); drive_volume_ = drive_volumes_[profile()->GetOriginalProfile()]; diff --git a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc index a9ae4b7..04349de 100644 --- a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc +++ b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc @@ -109,7 +109,7 @@ void DriveFirstRunTest::TearDownOnMainThread() { void DriveFirstRunTest::InitTestServer(const std::string& directory) { embedded_test_server()->ServeFilesFromDirectory( test_data_dir_.AppendASCII(directory)); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Configure the endpoint to use the test server's port. const GURL url(kTestEndpointUrl); diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc index f045f45..4322d44 100644 --- a/chrome/browser/chromeos/login/kiosk_browsertest.cc +++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc @@ -2143,8 +2143,8 @@ IN_PROC_BROWSER_TEST_F(KioskEnterpriseTest, PrivateStore) { set_test_app_id(kTestEnterpriseKioskApp); const char kPrivateStoreUpdate[] = "/private_store_update"; - net::test_server::EmbeddedTestServer private_server; - ASSERT_TRUE(private_server.InitializeAndWaitUntilReady()); + net::EmbeddedTestServer private_server; + ASSERT_TRUE(private_server.Start()); // |private_server| serves crx from test data dir. base::FilePath test_data_dir; diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc index 835c786..f1d2f1c 100644 --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc @@ -1075,7 +1075,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, FullscreenDisallowed) { IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExtensionsUncached) { // Make it possible to force-install a hosted app and an extension. - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); scoped_refptr<TestingUpdateManifestProvider> testing_update_manifest_provider( new TestingUpdateManifestProvider(kRelativeUpdateURL)); testing_update_manifest_provider->AddUpdate( @@ -1150,7 +1150,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExtensionsUncached) { } IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExtensionsCached) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Pre-populate the device local account's extension cache with a hosted app // and an extension. @@ -1245,7 +1245,7 @@ static void CreateFile(const base::FilePath& file, IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExtensionCacheImplTest) { // Make it possible to force-install a hosted app and an extension. - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); scoped_refptr<TestingUpdateManifestProvider> testing_update_manifest_provider( new TestingUpdateManifestProvider(kRelativeUpdateURL)); testing_update_manifest_provider->AddUpdate( @@ -1431,7 +1431,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExternalData) { } IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, UserAvatarImage) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); UploadDeviceLocalAccountPolicy(); AddPublicSessionToDevicePolicy(kAccountId1); @@ -2086,7 +2086,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, TermsOfServiceWithLocaleSwitch) { // Specify Terms of Service URL. - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); device_local_account_policy_.payload().mutable_termsofserviceurl()->set_value( embedded_test_server()->GetURL( std::string("/") + kExistentTermsOfServicePath).spec()); @@ -2213,7 +2213,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, TermsOfServiceWithLocaleSwitch) { IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, PolicyForExtensions) { // Set up a test update server for the Show Managed Storage app. - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); scoped_refptr<TestingUpdateManifestProvider> testing_update_manifest_provider( new TestingUpdateManifestProvider(kRelativeUpdateURL)); testing_update_manifest_provider->AddUpdate( @@ -2317,7 +2317,7 @@ class TermsOfServiceDownloadTest : public DeviceLocalAccountTest, IN_PROC_BROWSER_TEST_P(TermsOfServiceDownloadTest, TermsOfServiceScreen) { // Specify Terms of Service URL. - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); device_local_account_policy_.payload().mutable_termsofserviceurl()->set_value( embedded_test_server()->GetURL( std::string("/") + diff --git a/chrome/browser/chromeos/policy/upload_job_unittest.cc b/chrome/browser/chromeos/policy/upload_job_unittest.cc index 76eca09..fffbabe 100644 --- a/chrome/browser/chromeos/policy/upload_job_unittest.cc +++ b/chrome/browser/chromeos/policy/upload_job_unittest.cc @@ -178,7 +178,7 @@ class UploadJobTestBase : public testing::Test, public UploadJob::Delegate { request_context_getter_ = new net::TestURLRequestContextGetter( base::ThreadTaskRunnerHandle::Get()); oauth2_service_.AddAccount("robot@gmail.com"); - ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady()); + ASSERT_TRUE(test_server_.Start()); } // testing::Test: @@ -207,7 +207,7 @@ class UploadJobTestBase : public testing::Test, public UploadJob::Delegate { content::TestBrowserThreadBundle test_browser_thread_bundle_; base::RunLoop run_loop_; - net::test_server::EmbeddedTestServer test_server_; + net::EmbeddedTestServer test_server_; scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_; MockOAuth2TokenService oauth2_service_; diff --git a/chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc b/chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc index 3112502..1d917ae 100644 --- a/chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc +++ b/chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc @@ -45,7 +45,7 @@ typedef InProcessBrowserTest UserCloudExternalDataManagerTest; IN_PROC_BROWSER_TEST_F(UserCloudExternalDataManagerTest, FetchExternalData) { CloudExternalDataManagerBase::SetMaxExternalDataSizeForTesting(1000); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); const GURL url = embedded_test_server()->GetURL(std::string("/") + kExternalDataPath); diff --git a/chrome/browser/collected_cookies_browsertest.cc b/chrome/browser/collected_cookies_browsertest.cc index d687f7e..d190cf9f 100644 --- a/chrome/browser/collected_cookies_browsertest.cc +++ b/chrome/browser/collected_cookies_browsertest.cc @@ -19,7 +19,7 @@ typedef InProcessBrowserTest CollectedCookiesTest; // If this crashes on Windows, use http://crbug.com/79331 IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, DoubleDisplay) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Disable cookies. CookieSettingsFactory::GetForProfile(browser()->profile()) @@ -38,7 +38,7 @@ IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, DoubleDisplay) { // If this crashes on Windows, use http://crbug.com/79331 IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, NavigateAway) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Disable cookies. CookieSettingsFactory::GetForProfile(browser()->profile()) diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc index 9ccb329..c08f653 100644 --- a/chrome/browser/content_settings/content_settings_browsertest.cc +++ b/chrome/browser/content_settings/content_settings_browsertest.cc @@ -33,7 +33,7 @@ #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/url_request/url_request_mock_http_job.h" #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. @@ -47,11 +47,8 @@ using net::URLRequestMockHTTPJob; class ContentSettingsTest : public InProcessBrowserTest { public: - ContentSettingsTest() - : https_server_(net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::SSLOptions( - net::SpawnedTestServer::SSLOptions::CERT_OK), - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { + ContentSettingsTest() : https_server_(net::EmbeddedTestServer::TYPE_HTTPS) { + https_server_.ServeFilesFromSourceDirectory("chrome/test/data"); } void SetUpOnMainThread() override { @@ -94,42 +91,42 @@ class ContentSettingsTest : public InProcessBrowserTest { ASSERT_FALSE(GetCookies(browser()->profile(), url).empty()); } - net::SpawnedTestServer https_server_; + net::EmbeddedTestServer https_server_; }; // Sanity check on cookies before we do other tests. While these can be written // in content_browsertests, we want to verify Chrome's cookie storage and how it // handles incognito windows. IN_PROC_BROWSER_TEST_F(ContentSettingsTest, PRE_BasicCookies) { - ASSERT_TRUE(test_server()->Start()); - GURL http_url = test_server()->GetURL("files/setcookie.html"); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL http_url = embedded_test_server()->GetURL("/setcookie.html"); PreBasic(http_url); } IN_PROC_BROWSER_TEST_F(ContentSettingsTest, BasicCookies) { - ASSERT_TRUE(test_server()->Start()); - GURL http_url = test_server()->GetURL("files/setcookie.html"); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL http_url = embedded_test_server()->GetURL("/setcookie.html"); Basic(http_url); } IN_PROC_BROWSER_TEST_F(ContentSettingsTest, PRE_BasicCookiesHttps) { ASSERT_TRUE(https_server_.Start()); - GURL https_url = https_server_.GetURL("files/setcookie.html"); + GURL https_url = https_server_.GetURL("/setcookie.html"); PreBasic(https_url); } IN_PROC_BROWSER_TEST_F(ContentSettingsTest, BasicCookiesHttps) { ASSERT_TRUE(https_server_.Start()); - GURL https_url = https_server_.GetURL("files/setcookie.html"); + GURL https_url = https_server_.GetURL("/setcookie.html"); Basic(https_url); } // Verify that cookies are being blocked. IN_PROC_BROWSER_TEST_F(ContentSettingsTest, PRE_BlockCookies) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); CookieSettingsFactory::GetForProfile(browser()->profile()) ->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK); - GURL url = test_server()->GetURL("files/setcookie.html"); + GURL url = embedded_test_server()->GetURL("/setcookie.html"); ui_test_utils::NavigateToURL(browser(), url); ASSERT_TRUE(GetCookies(browser()->profile(), url).empty()); CookieCheckIncognitoWindow(url, false); @@ -145,8 +142,8 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest, BlockCookies) { // Verify that cookies can be allowed and set using exceptions for particular // website(s) when all others are blocked. IN_PROC_BROWSER_TEST_F(ContentSettingsTest, AllowCookiesUsingExceptions) { - ASSERT_TRUE(test_server()->Start()); - GURL url = test_server()->GetURL("files/setcookie.html"); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL url = embedded_test_server()->GetURL("/setcookie.html"); content_settings::CookieSettings* settings = CookieSettingsFactory::GetForProfile(browser()->profile()).get(); settings->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK); @@ -164,8 +161,8 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest, AllowCookiesUsingExceptions) { // Verify that cookies can be blocked for a specific website using exceptions. IN_PROC_BROWSER_TEST_F(ContentSettingsTest, BlockCookiesUsingExceptions) { - ASSERT_TRUE(test_server()->Start()); - GURL url = test_server()->GetURL("files/setcookie.html"); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL url = embedded_test_server()->GetURL("/setcookie.html"); content_settings::CookieSettings* settings = CookieSettingsFactory::GetForProfile(browser()->profile()).get(); settings->SetCookieSetting(ContentSettingsPattern::FromURL(url), @@ -176,7 +173,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest, BlockCookiesUsingExceptions) { ASSERT_TRUE(GetCookies(browser()->profile(), url).empty()); ASSERT_TRUE(https_server_.Start()); - GURL unblocked_url = https_server_.GetURL("files/cookie1.html"); + GURL unblocked_url = https_server_.GetURL("/cookie1.html"); ui_test_utils::NavigateToURL(browser(), unblocked_url); ASSERT_FALSE(GetCookies(browser()->profile(), unblocked_url).empty()); @@ -217,9 +214,9 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest, // Regression test for http://crbug.com/63649. IN_PROC_BROWSER_TEST_F(ContentSettingsTest, RedirectLoopCookies) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); - GURL test_url = test_server()->GetURL("files/redirect-loop.html"); + GURL test_url = embedded_test_server()->GetURL("/redirect-loop.html"); CookieSettingsFactory::GetForProfile(browser()->profile()) ->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK); @@ -255,15 +252,15 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest, ContentSettingsBlockDataURLs) { // Tests that if redirect across origins occurs, the new process still gets the // content settings before the resource headers. IN_PROC_BROWSER_TEST_F(ContentSettingsTest, RedirectCrossOrigin) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); - net::HostPortPair host_port = test_server()->host_port_pair(); + net::HostPortPair host_port = embedded_test_server()->host_port_pair(); DCHECK_EQ(host_port.host(), std::string("127.0.0.1")); std::string redirect(base::StringPrintf( - "http://localhost:%d/files/redirect-cross-origin.html", - host_port.port())); - GURL test_url = test_server()->GetURL("server-redirect?" + redirect); + "http://localhost:%d/redirect-cross-origin.html", host_port.port())); + GURL test_url = + embedded_test_server()->GetURL("/server-redirect?" + redirect); CookieSettingsFactory::GetForProfile(browser()->profile()) ->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK); diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc index 36ce51f..6850fb6 100644 --- a/chrome/browser/crash_recovery_browsertest.cc +++ b/chrome/browser/crash_recovery_browsertest.cc @@ -108,7 +108,7 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, ReloadCacheRevalidate) { // Use the test server so as not to bypass cache behavior. The title of the // active tab should change only when this URL is reloaded. - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); embedded_test_server()->RegisterRequestHandler( base::Bind(&CacheMaxAgeHandler::HandleRequest, base::Owned(new CacheMaxAgeHandler(kTestPath)))); diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc index 9a0f518..38d2e96 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc @@ -17,6 +17,7 @@ #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "third_party/WebKit/public/web/WebContextMenuData.h" using content::WebContents; @@ -112,8 +113,8 @@ IN_PROC_BROWSER_TEST_F(RegisterProtocolHandlerBrowserTest, } IN_PROC_BROWSER_TEST_F(RegisterProtocolHandlerBrowserTest, CustomHandler) { - ASSERT_TRUE(test_server()->Start()); - GURL handler_url = test_server()->GetURL("files/custom_handler_foo.html"); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL handler_url = embedded_test_server()->GetURL("/custom_handler_foo.html"); AddProtocolHandler("foo", handler_url); ui_test_utils::NavigateToURL(browser(), GURL("foo:test")); diff --git a/chrome/browser/devtools/device/port_forwarding_browsertest.cc b/chrome/browser/devtools/device/port_forwarding_browsertest.cc index 006e0b7..3ad185b 100644 --- a/chrome/browser/devtools/device/port_forwarding_browsertest.cc +++ b/chrome/browser/devtools/device/port_forwarding_browsertest.cc @@ -23,10 +23,10 @@ #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" +#include "net/test/embedded_test_server/embedded_test_server.h" namespace { -const char kPortForwardingTestPage[] = - "files/devtools/port_forwarding/main.html"; +const char kPortForwardingTestPage[] = "/devtools/port_forwarding/main.html"; const int kDefaultDebuggingPort = 9223; const int kAlternativeDebuggingPort = 9224; @@ -88,8 +88,8 @@ IN_PROC_BROWSER_TEST_F(PortForwardingTest, DevToolsAndroidBridge::Factory::GetForProfile(profile)-> set_device_providers_for_test(device_providers); - ASSERT_TRUE(test_server()->Start()); - GURL original_url = test_server()->GetURL(kPortForwardingTestPage); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL original_url = embedded_test_server()->GetURL(kPortForwardingTestPage); std::string forwarding_port("8000"); GURL forwarding_url(original_url.scheme() + "://" + @@ -159,8 +159,8 @@ IN_PROC_BROWSER_TEST_F(PortForwardingDisconnectTest, DisconnectOnRelease) { DevToolsAndroidBridge::Factory::GetForProfile(profile)-> set_device_providers_for_test(device_providers); - ASSERT_TRUE(test_server()->Start()); - GURL original_url = test_server()->GetURL(kPortForwardingTestPage); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL original_url = embedded_test_server()->GetURL(kPortForwardingTestPage); std::string forwarding_port("8000"); GURL forwarding_url(original_url.scheme() + "://" + diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc index 2bef961..99dd8359 100644 --- a/chrome/browser/devtools/devtools_sanity_browsertest.cc +++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc @@ -145,12 +145,12 @@ class DevToolsSanityTest : public InProcessBrowserTest { } void LoadTestPage(const std::string& test_page) { - GURL url = test_server()->GetURL(test_page); + GURL url = spawned_test_server()->GetURL(test_page); ui_test_utils::NavigateToURL(browser(), url); } void OpenDevToolsWindow(const std::string& test_page, bool is_docked) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(spawned_test_server()->Start()); LoadTestPage(test_page); window_ = DevToolsWindowTesting::OpenDevToolsWindowSync(GetInspectedTab(), @@ -484,8 +484,8 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest { void RunTest(const char* test_name, const char* test_page, const char* worker_path) { - ASSERT_TRUE(test_server()->Start()); - GURL url = test_server()->GetURL(test_page); + ASSERT_TRUE(spawned_test_server()->Start()); + GURL url = spawned_test_server()->GetURL(test_page); ui_test_utils::NavigateToURL(browser(), url); scoped_refptr<WorkerData> worker_data = @@ -616,7 +616,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest, // Disabled because of http://crbug.com/410327 IN_PROC_BROWSER_TEST_F(DevToolsUnresponsiveBeforeUnloadTest, DISABLED_TestUndockedDevToolsUnresponsive) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(spawned_test_server()->Start()); LoadTestPage(kDebuggerTestPage); DevToolsWindow* devtools_window = OpenDevToolWindowOnWebContents( GetInspectedTab(), false); @@ -639,7 +639,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsUnresponsiveBeforeUnloadTest, // @see http://crbug.com/323031 IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest, TestWorkerWindowClosing) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(spawned_test_server()->Start()); LoadTestPage(kDebuggerTestPage); DevToolsWindow* devtools_window = OpenDevToolWindowOnWebContents( GetInspectedTab(), false); @@ -653,7 +653,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest, // Disabled because of http://crbug.com/497857 IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest, DISABLED_TestDevToolsOnDevTools) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(spawned_test_server()->Start()); LoadTestPage(kDebuggerTestPage); std::vector<DevToolsWindow*> windows; @@ -838,7 +838,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestSettings) { // DevToolsWindow and results in inspected page navigation. IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDevToolsExternalNavigation) { OpenDevToolsWindow(kDebuggerTestPage, true); - GURL url = test_server()->GetURL(kNavigateBackTestPage); + GURL url = spawned_test_server()->GetURL(kNavigateBackTestPage); ui_test_utils::UrlLoadObserver observer(url, content::NotificationService::AllSources()); ASSERT_TRUE(content::ExecuteScript( @@ -936,8 +936,8 @@ IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, InspectSharedWorker) { // Disabled, crashes under Dr.Memory and ASan, http://crbug.com/432444. IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, DISABLED_PauseInSharedWorkerInitialization) { - ASSERT_TRUE(test_server()->Start()); - GURL url = test_server()->GetURL(kReloadSharedWorkerTestPage); + ASSERT_TRUE(spawned_test_server()->Start()); + GURL url = spawned_test_server()->GetURL(kReloadSharedWorkerTestPage); ui_test_utils::NavigateToURL(browser(), url); scoped_refptr<WorkerData> worker_data = diff --git a/chrome/browser/do_not_track_browsertest.cc b/chrome/browser/do_not_track_browsertest.cc index a3eef7a..f06e6c3 100644 --- a/chrome/browser/do_not_track_browsertest.cc +++ b/chrome/browser/do_not_track_browsertest.cc @@ -13,17 +13,18 @@ #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/embedded_test_server/embedded_test_server.h" typedef InProcessBrowserTest DoNotTrackTest; // Check that the DNT header is sent when the corresponding preference is set. IN_PROC_BROWSER_TEST_F(DoNotTrackTest, Simple) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); PrefService* prefs = browser()->profile()->GetPrefs(); prefs->SetBoolean(prefs::kEnableDoNotTrack, true); - GURL url = test_server()->GetURL("echoheader?DNT"); + GURL url = embedded_test_server()->GetURL("/echoheader?DNT"); ui_test_utils::NavigateToURL(browser(), url); int matches = ui_test_utils::FindInPage( @@ -37,14 +38,14 @@ IN_PROC_BROWSER_TEST_F(DoNotTrackTest, Simple) { // Check that the DNT header is preserved during redirects. IN_PROC_BROWSER_TEST_F(DoNotTrackTest, Redirect) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); PrefService* prefs = browser()->profile()->GetPrefs(); prefs->SetBoolean(prefs::kEnableDoNotTrack, true); - GURL final_url = test_server()->GetURL("echoheader?DNT"); - GURL url = test_server()->GetURL( - std::string("server-redirect?") + final_url.spec()); + GURL final_url = embedded_test_server()->GetURL("/echoheader?DNT"); + GURL url = embedded_test_server()->GetURL(std::string("/server-redirect?") + + final_url.spec()); ui_test_utils::NavigateToURL(browser(), url); int matches = ui_test_utils::FindInPage( diff --git a/chrome/browser/dom_distiller/tab_utils_browsertest.cc b/chrome/browser/dom_distiller/tab_utils_browsertest.cc index 5e34a74..6fd6aaf 100644 --- a/chrome/browser/dom_distiller/tab_utils_browsertest.cc +++ b/chrome/browser/dom_distiller/tab_utils_browsertest.cc @@ -94,7 +94,7 @@ class WebContentsMainFrameHelper : public content::WebContentsObserver { IN_PROC_BROWSER_TEST_F(DomDistillerTabUtilsBrowserTest, MAYBE_TestSwapWebContents) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::WebContents* initial_web_contents = browser()->tab_strip_model()->GetActiveWebContents(); @@ -128,7 +128,7 @@ IN_PROC_BROWSER_TEST_F(DomDistillerTabUtilsBrowserTest, IN_PROC_BROWSER_TEST_F(DomDistillerTabUtilsBrowserTest, TestDistillIntoWebContents) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::WebContents* source_web_contents = browser()->tab_strip_model()->GetActiveWebContents(); diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 6ae6059..4d48d78 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -851,7 +851,7 @@ class DownloadTest : public InProcessBrowserTest { // If a Select File dialog opens, will automatically choose the default. void DownloadFilesCheckErrorsSetup() { embedded_test_server()->ServeFilesFromDirectory(GetTestDataDirectory()); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); std::vector<DownloadItem*> download_items; GetDownloads(browser(), &download_items); ASSERT_TRUE(download_items.empty()); @@ -1229,7 +1229,7 @@ static scoped_ptr<net::test_server::HttpResponse> RespondWithContentTypeHandler( IN_PROC_BROWSER_TEST_F(DownloadTest, MimeTypesToShowNotDownload) { embedded_test_server()->RegisterRequestHandler( base::Bind(&RespondWithContentTypeHandler)); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // These files should all be displayed in the browser. const char* mime_types[] = { @@ -1699,7 +1699,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadHistoryCheck) { // persistence. embedded_test_server()->RegisterRequestHandler( base::Bind(&ServerRedirectRequestHandler)); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL redirect_url = embedded_test_server()->GetURL("/a?" + download_url.spec()); @@ -2167,7 +2167,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrlToPath) { IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaGet) { embedded_test_server()->ServeFilesFromDirectory(GetTestDataDirectory()); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); EnableFileChooser(true); std::vector<DownloadItem*> download_items; GetDownloads(browser(), &download_items); @@ -2246,7 +2246,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaPost) { embedded_test_server()->RegisterRequestHandler( base::Bind(&FilterPostOnlyURLsHandler)); embedded_test_server()->ServeFilesFromDirectory(GetTestDataDirectory()); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); EnableFileChooser(true); std::vector<DownloadItem*> download_items; GetDownloads(browser(), &download_items); @@ -2635,7 +2635,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, LoadURLExternallyReferrerPolicy) { embedded_test_server()->RegisterRequestHandler( base::Bind(&EchoReferrerRequestHandler)); embedded_test_server()->ServeFilesFromDirectory(GetTestDataDirectory()); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); EnableFileChooser(true); std::vector<DownloadItem*> download_items; GetDownloads(browser(), &download_items); @@ -2687,7 +2687,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, LoadURLExternallyReferrerPolicy) { IN_PROC_BROWSER_TEST_F(DownloadTest, SaveLinkAsReferrerPolicyOrigin) { embedded_test_server()->RegisterRequestHandler( base::Bind(&EchoReferrerRequestHandler)); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); EnableFileChooser(true); std::vector<DownloadItem*> download_items; GetDownloads(browser(), &download_items); @@ -2744,7 +2744,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SaveLinkAsReferrerPolicyOrigin) { IN_PROC_BROWSER_TEST_F(DownloadTest, SaveImageAsReferrerPolicyDefault) { embedded_test_server()->RegisterRequestHandler( base::Bind(&EchoReferrerRequestHandler)); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); EnableFileChooser(true); std::vector<DownloadItem*> download_items; GetDownloads(browser(), &download_items); diff --git a/chrome/browser/download/notification/download_notification_browsertest.cc b/chrome/browser/download/notification/download_notification_browsertest.cc index 7c260ef..8123406 100644 --- a/chrome/browser/download/notification/download_notification_browsertest.cc +++ b/chrome/browser/download/notification/download_notification_browsertest.cc @@ -277,7 +277,7 @@ class DownloadNotificationTestBase : public InProcessBrowserTest { } void SetUpOnMainThread() override { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::BrowserThread::PostTask( content::BrowserThread::IO, FROM_HERE, diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index c1f44f4..0c220e4 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -781,7 +781,7 @@ class SavePageSitePerProcessBrowserTest : public SavePageBrowserTest { SavePageBrowserTest::SetUpOnMainThread(); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::SetupCrossSiteRedirector(embedded_test_server()); } diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc index ba692e850..f178752b 100644 --- a/chrome/browser/errorpage_browsertest.cc +++ b/chrome/browser/errorpage_browsertest.cc @@ -44,7 +44,7 @@ #include "net/base/net_util.h" #include "net/http/failing_http_transaction_factory.h" #include "net/http/http_cache.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/url_request/url_request_failed_job.h" #include "net/test/url_request/url_request_mock_http_job.h" #include "net/url_request/url_request_context.h" @@ -902,10 +902,10 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, Page404) { // is correctly transferred, and that stale cached copied can be loaded // from the javascript. IN_PROC_BROWSER_TEST_F(ErrorPageTest, StaleCacheStatus) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Load cache with entry with "nocache" set, to create stale // cache. - GURL test_url(test_server()->GetURL("files/nocache.html")); + GURL test_url(embedded_test_server()->GetURL("/nocache.html")); NavigateToURLAndWaitForTitle(test_url, "Nocache Test Page", 1); // Reload same URL after forcing an error from the the network layer; @@ -1145,10 +1145,10 @@ IN_PROC_BROWSER_TEST_F(ErrorPageNavigationCorrectionsFailTest, // above. IN_PROC_BROWSER_TEST_F(ErrorPageNavigationCorrectionsFailTest, StaleCacheStatusFailedCorrections) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Load cache with entry with "nocache" set, to create stale // cache. - GURL test_url(test_server()->GetURL("files/nocache.html")); + GURL test_url(embedded_test_server()->GetURL("/nocache.html")); NavigateToURLAndWaitForTitle(test_url, "Nocache Test Page", 1); // Reload same URL after forcing an error from the the network layer; diff --git a/chrome/browser/extensions/active_script_controller_browsertest.cc b/chrome/browser/extensions/active_script_controller_browsertest.cc index e28bf662..ce80212 100644 --- a/chrome/browser/extensions/active_script_controller_browsertest.cc +++ b/chrome/browser/extensions/active_script_controller_browsertest.cc @@ -348,7 +348,7 @@ IN_PROC_BROWSER_TEST_F(ActiveScriptControllerBrowserTest, // Navigate to an URL (which matches the explicit host specified in the // extension content_scripts_explicit_hosts). All four extensions should // inject the script. - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURL( browser(), embedded_test_server()->GetURL("/extensions/test_file.html")); @@ -376,7 +376,7 @@ IN_PROC_BROWSER_TEST_F(ActiveScriptControllerBrowserTest, ActiveScriptController::GetForWebContents(web_contents); ASSERT_TRUE(active_script_controller); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURL( browser(), embedded_test_server()->GetURL("/extensions/test_file.html")); @@ -424,7 +424,7 @@ IN_PROC_BROWSER_TEST_F(ActiveScriptControllerBrowserTest, false /* won't reply */)); inject_success_listener.set_extension_id(extension->id()); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL url = embedded_test_server()->GetURL("/extensions/test_file.html"); ui_test_utils::NavigateToURL(browser(), url); @@ -488,7 +488,7 @@ IN_PROC_BROWSER_TEST_F(FlagOffActiveScriptControllerBrowserTest, EXECUTE_SCRIPT), }; - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURL( browser(), embedded_test_server()->GetURL("/extensions/test_file.html")); diff --git a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc index 5236b96..0fdf5f3 100644 --- a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc +++ b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc @@ -11,6 +11,7 @@ #include "chrome/common/extensions/api/cloud_print_private.h" #include "components/cloud_devices/common/cloud_devices_switches.h" #include "net/dns/mock_host_resolver.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -26,7 +27,7 @@ class ExtensionCloudPrintPrivateApiTest : public ExtensionApiTest { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( switches::kCloudPrintURL, - "http://www.cloudprintapp.com/files/extensions/api_test/" + "http://www.cloudprintapp.com/extensions/api_test/" "cloud_print_private"); } @@ -34,7 +35,7 @@ class ExtensionCloudPrintPrivateApiTest : public ExtensionApiTest { // Start up the test server and get us ready for calling the install // API functions. host_resolver()->AddRule("www.cloudprintapp.com", "127.0.0.1"); - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); } protected: @@ -42,8 +43,8 @@ class ExtensionCloudPrintPrivateApiTest : public ExtensionApiTest { // matches the cloud print app's extent that we set up via command line // flags. GURL GetTestServerURL(const std::string& path) { - GURL url = test_server()->GetURL( - "files/extensions/api_test/cloud_print_private/" + path); + GURL url = embedded_test_server()->GetURL( + "/extensions/api_test/cloud_print_private/" + path); // Replace the host with 'www.cloudprintapp.com' so it matches the cloud // print app's extent. diff --git a/chrome/browser/extensions/api/context_menus/context_menu_apitest.cc b/chrome/browser/extensions/api/context_menus/context_menu_apitest.cc index e4cd9cf..2dcdab1 100644 --- a/chrome/browser/extensions/api/context_menus/context_menu_apitest.cc +++ b/chrome/browser/extensions/api/context_menus/context_menu_apitest.cc @@ -9,6 +9,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/test/base/ui_test_utils.h" #include "extensions/test/result_catcher.h" +#include "net/test/embedded_test_server/embedded_test_server.h" namespace extensions { @@ -28,7 +29,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ContextMenus) { // crbug.com/51436 -- creating context menus from multiple script contexts // should work. IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContextMenusFromMultipleContexts) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunExtensionTest("context_menus/add_from_multiple_contexts")) << message_; const extensions::Extension* extension = GetSingleLoadedExtension(); diff --git a/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc b/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc index d6538b7..e16014d 100644 --- a/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc +++ b/chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc @@ -197,7 +197,7 @@ testing::AssertionResult RequestContentScriptAPITest::CreateAndLoadExtension( // http://crbug.com/421118 IN_PROC_BROWSER_TEST_F(RequestContentScriptAPITest, DISABLED_PermissionMatcherAgreementInjection) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Positive tests: permissions and matcher contain conditions that match URL // visited during test. diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc index 21c965c..1edc60c 100644 --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc @@ -190,7 +190,7 @@ IN_PROC_BROWSER_TEST_F(DesktopCaptureApiTest, DISABLED_Delegation) { EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data)); embedded_test_server()->ServeFilesFromDirectory(test_data.AppendASCII( "extensions/api_test/desktop_capture_delegate")); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); host_resolver()->AddRule("*", embedded_test_server()->base_url().host()); // Load extension. diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc index df3396b..6e8821d 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc @@ -43,6 +43,7 @@ #include "extensions/browser/notification_types.h" #include "net/base/data_url.h" #include "net/base/net_util.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/url_request/url_request_slow_download_job.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" @@ -1490,8 +1491,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadExtensionTest_Download_Basic) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); GoOnTheRecord(); // Start downloading a file. @@ -1514,14 +1514,13 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, " \"paused\": false," " \"url\": \"%s\"}]", download_url.c_str()))); - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\": %d," @@ -1537,9 +1536,8 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadExtensionTest_Download_Incognito) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); GoOffTheRecord(); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -1561,14 +1559,13 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, " \"paused\": false," " \"url\": \"%s\"}]", download_url.c_str()))); - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\":%d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\":%d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\":%d," @@ -1592,7 +1589,6 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, MAYBE_DownloadExtensionTest_Download_UnsafeHeaders) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); GoOnTheRecord(); static const char* const kUnsafeHeaders[] = { @@ -1624,7 +1620,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, }; for (size_t index = 0; index < arraysize(kUnsafeHeaders); ++index) { - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); EXPECT_STREQ(errors::kInvalidHeaderUnsafe, RunFunctionAndReturnError(new DownloadsDownloadFunction(), base::StringPrintf( @@ -1644,9 +1640,8 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadExtensionTest_Download_InvalidHeaders) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); GoOnTheRecord(); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); EXPECT_STREQ(errors::kInvalidHeaderName, RunFunctionAndReturnError(new DownloadsDownloadFunction(), base::StringPrintf( @@ -1679,8 +1674,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, MAYBE_DownloadExtensionTest_Download_Subdirectory) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); GoOnTheRecord(); scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -1726,8 +1720,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadExtensionTest_Download_InvalidFilename) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); GoOnTheRecord(); EXPECT_STREQ(errors::kInvalidFilename, @@ -1790,8 +1783,8 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadExtensionTest_Download_URLFragment) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0#fragment").spec(); + std::string download_url = + embedded_test_server()->GetURL("/slow?0#fragment").spec(); GoOnTheRecord(); scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -1813,14 +1806,13 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, " \"paused\": false," " \"url\": \"%s\"}]", download_url.c_str()))); - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\": %d," @@ -2017,8 +2009,8 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadExtensionTest_Download_AuthBasic_Fail) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("auth-basic").spec(); + std::string download_url = + embedded_test_server()->GetURL("/auth-basic").spec(); GoOnTheRecord(); scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -2050,9 +2042,12 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadExtensionTest_Download_Headers) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("files/downloads/" - "a_zip_file.zip?expected_headers=Foo:bar&expected_headers=Qx:yo").spec(); + std::string download_url = + embedded_test_server() + ->GetURL( + "/downloads/" + "a_zip_file.zip?expected_headers=Foo:bar&expected_headers=Qx:yo") + .spec(); GoOnTheRecord(); scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -2104,9 +2099,12 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadExtensionTest_Download_Headers_Fail) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("files/downloads/" - "a_zip_file.zip?expected_headers=Foo:bar&expected_headers=Qx:yo").spec(); + std::string download_url = + embedded_test_server() + ->GetURL( + "/downloads/" + "a_zip_file.zip?expected_headers=Foo:bar&expected_headers=Qx:yo") + .spec(); GoOnTheRecord(); scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -2141,8 +2139,8 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadExtensionTest_Download_AuthBasic) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("auth-basic").spec(); + std::string download_url = + embedded_test_server()->GetURL("/auth-basic").spec(); // This is just base64 of 'username:secret'. static const char kAuthorization[] = "dXNlcm5hbWU6c2VjcmV0"; GoOnTheRecord(); @@ -2168,7 +2166,6 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, "[{\"danger\": \"safe\"," " \"incognito\": false," " \"bytesReceived\": 0.0," - " \"fileSize\": 0.0," " \"mime\": \"text/html\"," " \"paused\": false," " \"url\": \"%s\"}]", @@ -2188,9 +2185,11 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadExtensionTest_Download_Post) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("files/post/downloads/" - "a_zip_file.zip?expected_body=BODY").spec(); + std::string download_url = embedded_test_server() + ->GetURL( + "/post/downloads/" + "a_zip_file.zip?expected_body=BODY") + .spec(); GoOnTheRecord(); scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -2242,9 +2241,11 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadExtensionTest_Download_Post_Get) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("files/post/downloads/" - "a_zip_file.zip?expected_body=BODY").spec(); + std::string download_url = embedded_test_server() + ->GetURL( + "/post/downloads/" + "a_zip_file.zip?expected_body=BODY") + .spec(); GoOnTheRecord(); scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -2283,9 +2284,11 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadExtensionTest_Download_Post_NoBody) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("files/post/downloads/" - "a_zip_file.zip?expected_body=BODY").spec(); + std::string download_url = embedded_test_server() + ->GetURL( + "/post/downloads/" + "a_zip_file.zip?expected_body=BODY") + .spec(); GoOnTheRecord(); scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -2323,9 +2326,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, DownloadExtensionTest_Download_Cancel) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL( - "download-known-size").spec(); + ASSERT_TRUE(spawned_test_server()->Start()); + std::string download_url = + spawned_test_server()->GetURL("download-known-size").spec(); GoOnTheRecord(); scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -2435,8 +2438,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, LoadExtension("downloads_split"); AddFilenameDeterminer(); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -2482,14 +2484,13 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, EXPECT_EQ("", error); // The download should complete successfully. - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\": %d," @@ -2507,8 +2508,7 @@ IN_PROC_BROWSER_TEST_F( LoadExtension("downloads_split"); AddFilenameDeterminer(); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); ExtensionDownloadsEventRouter::SetDetermineFilenameTimeoutSecondsForTesting( 0); @@ -2546,13 +2546,13 @@ IN_PROC_BROWSER_TEST_F( // Do not respond to the onDeterminingFilename. // The download should complete successfully. - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf("[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf("[{\"id\": %d," " \"state\": {" @@ -2567,8 +2567,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, LoadExtension("downloads_split"); AddFilenameDeterminer(); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -2625,13 +2624,13 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, EXPECT_EQ(errors::kTooManyListeners, error); // The download should complete successfully. - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf("[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf("[{\"id\": %d," " \"state\": {" @@ -2647,8 +2646,7 @@ IN_PROC_BROWSER_TEST_F( LoadExtension("downloads_split"); AddFilenameDeterminer(); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -2726,8 +2724,7 @@ IN_PROC_BROWSER_TEST_F( LoadExtension("downloads_split"); AddFilenameDeterminer(); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -2770,14 +2767,13 @@ IN_PROC_BROWSER_TEST_F( downloads::FILENAME_CONFLICT_ACTION_UNIQUIFY, &error)); EXPECT_STREQ(errors::kInvalidFilename, error.c_str()); - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\": %d," @@ -2794,8 +2790,7 @@ IN_PROC_BROWSER_TEST_F( LoadExtension("downloads_split"); AddFilenameDeterminer(); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -2838,14 +2833,13 @@ IN_PROC_BROWSER_TEST_F( downloads::FILENAME_CONFLICT_ACTION_UNIQUIFY, &error)); EXPECT_STREQ(errors::kInvalidFilename, error.c_str()); - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\": %d," @@ -2862,8 +2856,7 @@ IN_PROC_BROWSER_TEST_F( LoadExtension("downloads_split"); AddFilenameDeterminer(); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -2907,14 +2900,13 @@ IN_PROC_BROWSER_TEST_F( downloads::FILENAME_CONFLICT_ACTION_UNIQUIFY, &error)); EXPECT_STREQ(errors::kInvalidFilename, error.c_str()); - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\": %d," @@ -2937,8 +2929,7 @@ IN_PROC_BROWSER_TEST_F( LoadExtension("downloads_split"); AddFilenameDeterminer(); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -2981,14 +2972,13 @@ IN_PROC_BROWSER_TEST_F( downloads::FILENAME_CONFLICT_ACTION_UNIQUIFY, &error)); EXPECT_STREQ(errors::kInvalidFilename, error.c_str()); - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\": %d," @@ -3005,8 +2995,7 @@ IN_PROC_BROWSER_TEST_F( LoadExtension("downloads_split"); AddFilenameDeterminer(); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -3049,14 +3038,13 @@ IN_PROC_BROWSER_TEST_F( downloads::FILENAME_CONFLICT_ACTION_UNIQUIFY, &error)); EXPECT_STREQ(errors::kInvalidFilename, error.c_str()); - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\": %d," @@ -3070,11 +3058,10 @@ IN_PROC_BROWSER_TEST_F( DownloadExtensionTest, DownloadExtensionTest_OnDeterminingFilename_ParentDirInvalid) { ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); GoOnTheRecord(); LoadExtension("downloads_split"); AddFilenameDeterminer(); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -3117,14 +3104,13 @@ IN_PROC_BROWSER_TEST_F( downloads::FILENAME_CONFLICT_ACTION_UNIQUIFY, &error)); EXPECT_STREQ(errors::kInvalidFilename, error.c_str()); - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\": %d," @@ -3141,8 +3127,7 @@ IN_PROC_BROWSER_TEST_F( LoadExtension("downloads_split"); AddFilenameDeterminer(); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -3186,14 +3171,13 @@ IN_PROC_BROWSER_TEST_F( &error)); EXPECT_STREQ(errors::kInvalidFilename, error.c_str()); - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\": %d," @@ -3210,8 +3194,7 @@ IN_PROC_BROWSER_TEST_F( LoadExtension("downloads_split"); AddFilenameDeterminer(); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -3255,14 +3238,13 @@ IN_PROC_BROWSER_TEST_F( &error)); EXPECT_STREQ(errors::kInvalidFilename, error.c_str()); - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\": %d," @@ -3280,8 +3262,7 @@ IN_PROC_BROWSER_TEST_F( LoadExtension("downloads_split"); AddFilenameDeterminer(); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -3324,14 +3305,13 @@ IN_PROC_BROWSER_TEST_F( &error)); EXPECT_EQ("", error); - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\": %d," @@ -3385,14 +3365,13 @@ IN_PROC_BROWSER_TEST_F( &error)); EXPECT_EQ("", error); - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\": %d," @@ -3409,8 +3388,7 @@ IN_PROC_BROWSER_TEST_F( LoadExtension("downloads_split"); AddFilenameDeterminer(); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -3453,14 +3431,13 @@ IN_PROC_BROWSER_TEST_F( &error)); EXPECT_EQ("", error); - ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, - base::StringPrintf( - "[{\"id\": %d," - " \"filename\": {" - " \"previous\": \"\"," - " \"current\": \"%s\"}}]", - result_id, - GetFilename("slow.txt").c_str()))); + ASSERT_TRUE( + WaitFor(downloads::OnChanged::kEventName, + base::StringPrintf("[{\"id\": %d," + " \"filename\": {" + " \"previous\": \"\"," + " \"current\": \"%s\"}}]", + result_id, GetFilename("slow.txt").c_str()))); ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName, base::StringPrintf( "[{\"id\": %d," @@ -3544,11 +3521,10 @@ IN_PROC_BROWSER_TEST_F( DownloadExtensionTest, MAYBE_DownloadExtensionTest_OnDeterminingFilename_RemoveFilenameDeterminer) { ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); GoOnTheRecord(); LoadExtension("downloads_split"); content::RenderProcessHost* host = AddFilenameDeterminer(); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); // Start downloading a file. scoped_ptr<base::Value> result(RunFunctionAndReturnResult( @@ -3597,8 +3573,7 @@ IN_PROC_BROWSER_TEST_F( DownloadExtensionTest_OnDeterminingFilename_IncognitoSplit) { LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); GoOnTheRecord(); AddFilenameDeterminer(); @@ -3736,8 +3711,7 @@ IN_PROC_BROWSER_TEST_F( DownloadExtensionTest_OnDeterminingFilename_IncognitoSpanning) { LoadExtension("downloads_spanning"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); - std::string download_url = test_server()->GetURL("slow?0").spec(); + std::string download_url = embedded_test_server()->GetURL("/slow?0").spec(); GoOnTheRecord(); AddFilenameDeterminer(); @@ -3888,7 +3862,6 @@ IN_PROC_BROWSER_TEST_F( switches::kEnableDownloadResumption); LoadExtension("downloads_split"); ASSERT_TRUE(StartEmbeddedTestServer()); - ASSERT_TRUE(test_server()->Start()); GoOnTheRecord(); content::RenderProcessHost* host = AddFilenameDeterminer(); diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc index 0b7f5cb..c971ea6 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc @@ -29,6 +29,7 @@ #include "extensions/common/feature_switch.h" #include "extensions/test/result_catcher.h" #include "grit/theme_resources.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" @@ -119,7 +120,7 @@ class BrowserActionApiTest : public ExtensionApiTest { }; IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunExtensionTest("browser_action/basics")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; @@ -141,8 +142,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) { action->GetBadgeBackgroundColor(ExtensionAction::kDefaultTabId)); // Simulate the browser action being clicked. - ui_test_utils::NavigateToURL(browser(), - test_server()->GetURL("files/extensions/test_file.txt")); + ui_test_utils::NavigateToURL( + browser(), embedded_test_server()->GetURL("/extensions/test_file.txt")); ExtensionActionAPI::Get(browser()->profile())->ExecuteExtensionAction( extension, browser(), true); @@ -484,7 +485,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionRemovePopup) { } IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoBasic) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunExtensionTest("browser_action/basics")) << message_; const Extension* extension = GetSingleLoadedExtension(); @@ -586,7 +587,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DISABLED_CloseBackgroundPage) { } IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BadgeBackgroundColor) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunExtensionTest("browser_action/color")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; @@ -648,7 +649,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Getters) { // Verify triggering browser action. IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TestTriggerBrowserAction) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunExtensionTest("trigger_actions/browser_action")) << message_; const Extension* extension = GetSingleLoadedExtension(); @@ -657,9 +658,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TestTriggerBrowserAction) { // Test that there is a browser action in the toolbar. ASSERT_EQ(1, GetBrowserActionsBar()->NumberOfBrowserActions()); - ui_test_utils::NavigateToURL( - browser(), - test_server()->GetURL("files/simple.html")); + ui_test_utils::NavigateToURL(browser(), + embedded_test_server()->GetURL("/simple.html")); ExtensionAction* browser_action = GetBrowserAction(*extension); EXPECT_TRUE(browser_action != NULL); diff --git a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc index 0a03fdb..c0e0311 100644 --- a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc @@ -22,6 +22,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/test/result_catcher.h" +#include "net/test/embedded_test_server/embedded_test_server.h" using content::WebContents; @@ -37,7 +38,7 @@ class PageActionApiTest : public ExtensionApiTest { }; IN_PROC_BROWSER_TEST_F(PageActionApiTest, Basic) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunExtensionTest("page_action/basics")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; @@ -201,7 +202,7 @@ IN_PROC_BROWSER_TEST_F(PageActionApiTest, Getters) { // Verify triggering page action. IN_PROC_BROWSER_TEST_F(PageActionApiTest, TestTriggerPageAction) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunExtensionTest("trigger_actions/page_action")) << message_; const Extension* extension = GetSingleLoadedExtension(); @@ -209,7 +210,7 @@ IN_PROC_BROWSER_TEST_F(PageActionApiTest, TestTriggerPageAction) { // Page action icon is displayed when a tab is created. ui_test_utils::NavigateToURL(browser(), - test_server()->GetURL("files/simple.html")); + embedded_test_server()->GetURL("/simple.html")); chrome::NewTab(browser()); browser()->tab_strip_model()->ActivateTabAt(0, true); diff --git a/chrome/browser/extensions/api/i18n/i18n_apitest.cc b/chrome/browser/extensions/api/i18n/i18n_apitest.cc index 96c3605..df16809 100644 --- a/chrome/browser/extensions/api/i18n/i18n_apitest.cc +++ b/chrome/browser/extensions/api/i18n/i18n_apitest.cc @@ -19,7 +19,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18N) { } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18NUpdate) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Create an Extension whose messages.json file will be updated. base::ScopedTempDir extension_dir; ASSERT_TRUE(extension_dir.CreateUniqueTempDir()); diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc index b964bc9..fceefe9 100644 --- a/chrome/browser/extensions/api/identity/identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc @@ -55,7 +55,7 @@ #include "extensions/common/test_util.h" #include "google_apis/gaia/google_service_auth_error.h" #include "google_apis/gaia/oauth2_mint_token_flow.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" @@ -1781,13 +1781,11 @@ class LaunchWebAuthFlowFunctionTest : public AsyncExtensionBrowserTest { }; IN_PROC_BROWSER_TEST_F(LaunchWebAuthFlowFunctionTest, UserCloseWindow) { - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL( - "chrome/test/data/extensions/api_test/identity"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.ServeFilesFromSourceDirectory( + "chrome/test/data/extensions/api_test/identity"); ASSERT_TRUE(https_server.Start()); - GURL auth_url(https_server.GetURL("files/interaction_required.html")); + GURL auth_url(https_server.GetURL("/interaction_required.html")); scoped_refptr<IdentityLaunchWebAuthFlowFunction> function( new IdentityLaunchWebAuthFlowFunction()); @@ -1807,13 +1805,11 @@ IN_PROC_BROWSER_TEST_F(LaunchWebAuthFlowFunctionTest, UserCloseWindow) { } IN_PROC_BROWSER_TEST_F(LaunchWebAuthFlowFunctionTest, InteractionRequired) { - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL( - "chrome/test/data/extensions/api_test/identity"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.ServeFilesFromSourceDirectory( + "chrome/test/data/extensions/api_test/identity"); ASSERT_TRUE(https_server.Start()); - GURL auth_url(https_server.GetURL("files/interaction_required.html")); + GURL auth_url(https_server.GetURL("/interaction_required.html")); scoped_refptr<IdentityLaunchWebAuthFlowFunction> function( new IdentityLaunchWebAuthFlowFunction()); @@ -1829,13 +1825,11 @@ IN_PROC_BROWSER_TEST_F(LaunchWebAuthFlowFunctionTest, InteractionRequired) { } IN_PROC_BROWSER_TEST_F(LaunchWebAuthFlowFunctionTest, LoadFailed) { - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL( - "chrome/test/data/extensions/api_test/identity"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.ServeFilesFromSourceDirectory( + "chrome/test/data/extensions/api_test/identity"); ASSERT_TRUE(https_server.Start()); - GURL auth_url(https_server.GetURL("files/five_hundred.html")); + GURL auth_url(https_server.GetURL("/five_hundred.html")); scoped_refptr<IdentityLaunchWebAuthFlowFunction> function( new IdentityLaunchWebAuthFlowFunction()); @@ -1905,13 +1899,11 @@ IN_PROC_BROWSER_TEST_F( IN_PROC_BROWSER_TEST_F(LaunchWebAuthFlowFunctionTest, DISABLED_InteractiveSecondNavigationSuccess) { - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL( - "chrome/test/data/extensions/api_test/identity"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.ServeFilesFromSourceDirectory( + "chrome/test/data/extensions/api_test/identity"); ASSERT_TRUE(https_server.Start()); - GURL auth_url(https_server.GetURL("files/redirect_to_chromiumapp.html")); + GURL auth_url(https_server.GetURL("/redirect_to_chromiumapp.html")); scoped_refptr<IdentityLaunchWebAuthFlowFunction> function( new IdentityLaunchWebAuthFlowFunction()); diff --git a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc index e34f6fc..9266ff7 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc +++ b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc @@ -43,7 +43,6 @@ using extensions::ResultCatcher; using net::test_server::BasicHttpResponse; using net::test_server::HttpRequest; using net::test_server::HttpResponse; -using net::test_server::EmbeddedTestServer; using testing::_; namespace streams_private = extensions::api::streams_private; @@ -136,8 +135,8 @@ class StreamsPrivateApiTest : public ExtensionApiTest { void SetUpOnMainThread() override { // Init test server. - test_server_.reset(new EmbeddedTestServer); - ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady()); + test_server_.reset(new net::EmbeddedTestServer); + ASSERT_TRUE(test_server_->Start()); test_server_->RegisterRequestHandler(base::Bind(&HandleRequest)); ExtensionApiTest::SetUpOnMainThread(); @@ -235,7 +234,7 @@ class StreamsPrivateApiTest : public ExtensionApiTest { protected: std::string test_extension_id_; // The HTTP server used in the tests. - scoped_ptr<EmbeddedTestServer> test_server_; + scoped_ptr<net::EmbeddedTestServer> test_server_; base::ScopedTempDir downloads_dir_; }; diff --git a/chrome/browser/extensions/api/tabs/tabs_test.cc b/chrome/browser/extensions/api/tabs/tabs_test.cc index 9fff228..4ee2243 100644 --- a/chrome/browser/extensions/api/tabs/tabs_test.cc +++ b/chrome/browser/extensions/api/tabs/tabs_test.cc @@ -42,7 +42,7 @@ #include "extensions/common/test_util.h" #include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_observer.h" @@ -1608,15 +1608,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsZoomTest, ZoomSettings) { // load without causing an error page load), (2) have different domains, and // (3) are zoomable by the extension API (this last condition rules out // chrome:// urls). We achieve this by noting that about:blank meets these - // requirements, allowing us to spin up a spawned http server on localhost to - // get the other domain. - net::SpawnedTestServer http_server( - net::SpawnedTestServer::TYPE_HTTP, - net::SpawnedTestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + // requirements, allowing us to spin up an embedded http server on localhost + // to get the other domain. + net::EmbeddedTestServer http_server; + http_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(http_server.Start()); - GURL url_A = http_server.GetURL("files/simple.html"); + GURL url_A = http_server.GetURL("/simple.html"); GURL url_B("about:blank"); // Tabs A1 and A2 are navigated to the same origin, while B is navigated @@ -1675,13 +1673,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsZoomTest, ZoomSettings) { } IN_PROC_BROWSER_TEST_F(ExtensionTabsZoomTest, PerTabResetsOnNavigation) { - net::SpawnedTestServer http_server( - net::SpawnedTestServer::TYPE_HTTP, - net::SpawnedTestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer http_server; + http_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(http_server.Start()); - GURL url_A = http_server.GetURL("files/simple.html"); + GURL url_A = http_server.GetURL("/simple.html"); GURL url_B("about:blank"); content::WebContents* web_contents = OpenUrlAndWaitForLoad(url_A); diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc index 656b7d3..28f99f3 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc @@ -32,6 +32,7 @@ #include "gpu/config/gpu_feature_type.h" #include "gpu/config/gpu_info.h" #include "net/dns/mock_host_resolver.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "ui/gl/gl_switches.h" using gpu::GpuFeatureType; @@ -101,7 +102,7 @@ class ExtensionWebstorePrivateApiTest : public ExtensionApiTest { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( switches::kAppsGalleryURL, - "http://www.example.com/files/extensions/api_test"); + "http://www.example.com/extensions/api_test"); } void SetUpInProcessBrowserTestFixture() override { @@ -110,7 +111,7 @@ class ExtensionWebstorePrivateApiTest : public ExtensionApiTest { // Start up the test server and get us ready for calling the install // API functions. host_resolver()->AddRule("www.example.com", "127.0.0.1"); - ASSERT_TRUE(StartSpawnedTestServer()); + ASSERT_TRUE(StartEmbeddedTestServer()); extensions::ExtensionInstallUI::set_disable_failure_ui_for_tests(); } @@ -130,7 +131,7 @@ class ExtensionWebstorePrivateApiTest : public ExtensionApiTest { // Returns a test server URL, but with host 'www.example.com' so it matches // the web store app's extent that we set up via command line flags. GURL DoGetTestServerURL(const std::string& path) { - GURL url = test_server()->GetURL(path); + GURL url = embedded_test_server()->GetURL(path); // Replace the host with 'www.example.com' so it matches the web store // app's extent. @@ -142,7 +143,7 @@ class ExtensionWebstorePrivateApiTest : public ExtensionApiTest { virtual GURL GetTestServerURL(const std::string& path) { return DoGetTestServerURL( - std::string("files/extensions/api_test/webstore_private/") + path); + std::string("/extensions/api_test/webstore_private/") + path); } // Navigates to |page| and runs the Extension API test there. Any downloads @@ -189,8 +190,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, base::string16 failure_title = base::UTF8ToUTF16("FAIL"); content::TitleWatcher watcher(GetWebContents(), expected_title); watcher.AlsoWaitForTitle(failure_title); - GURL url = test_server()->GetURL( - "files/extensions/api_test/webstore_private/noframe.html"); + GURL url = embedded_test_server()->GetURL( + "/extensions/api_test/webstore_private/noframe.html"); ui_test_utils::NavigateToURL(browser(), url); base::string16 final_title = watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, final_title); @@ -204,8 +205,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, base::string16 failure_title = base::UTF8ToUTF16("FAIL"); content::TitleWatcher watcher(GetWebContents(), expected_title); watcher.AlsoWaitForTitle(failure_title); - GURL url = test_server()->GetURL( - "files/extensions/api_test/webstore_private/noframe2.html"); + GURL url = embedded_test_server()->GetURL( + "/extensions/api_test/webstore_private/noframe2.html"); ui_test_utils::NavigateToURL(browser(), url); base::string16 final_title = watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, final_title); diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 9539515..e0a17bd 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -73,7 +73,7 @@ class AppApiTest : public ExtensionApiTest { extensions::ProcessMap::Get(browser()->profile()); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII(app_name))); @@ -150,7 +150,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_AppProcess) { extensions::ProcessMap::Get(browser()->profile()); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app_process"))); @@ -298,7 +298,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_BookmarkAppGetsNormalProcess) { extensions::ProcessMap::Get(browser()->profile()); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL base_url = GetTestBaseURL("app_process"); // Load an app as a bookmark app. @@ -378,7 +378,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_BookmarkAppGetsNormalProcess) { // Flaky. http://crbug.com/341898 IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_AppProcessRedirectBack) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app_process"))); @@ -423,7 +423,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, NavigateIntoAppProcess) { extensions::ProcessMap::Get(browser()->profile()); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // The app under test acts on URLs whose host is "localhost", // so the URLs we navigate to must have host "localhost". @@ -470,7 +470,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, ReloadIntoAppProcess) { extensions::ProcessMap::Get(browser()->profile()); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // The app under test acts on URLs whose host is "localhost", // so the URLs we navigate to must have host "localhost". @@ -535,7 +535,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, ReloadIntoAppProcessWithJavaScript) { extensions::ProcessMap::Get(browser()->profile()); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // The app under test acts on URLs whose host is "localhost", // so the URLs we navigate to must have host "localhost". @@ -607,7 +607,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromIframe) { extensions::ProcessMap::Get(browser()->profile()); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL base_url = GetTestBaseURL("app_process"); @@ -644,7 +644,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromIframe) { #endif IN_PROC_BROWSER_TEST_F(BlockedAppApiTest, MAYBE_OpenAppFromIframe) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Load app and start URL (not in the app). const Extension* app = @@ -751,7 +751,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenWebPopupFromWebIframe) { extensions::ProcessMap::Get(browser()->profile()); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL base_url = GetTestBaseURL("app_process"); @@ -794,7 +794,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadAppAfterCrash) { extensions::ProcessMap::Get(browser()->profile()); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app_process"))); @@ -836,7 +836,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, SameBrowsingInstanceAfterSwap) { extensions::ProcessMap::Get(browser()->profile()); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL base_url = GetTestBaseURL("app_process"); diff --git a/chrome/browser/extensions/background_xhr_browsertest.cc b/chrome/browser/extensions/background_xhr_browsertest.cc index 6ff6deb..276352c 100644 --- a/chrome/browser/extensions/background_xhr_browsertest.cc +++ b/chrome/browser/extensions/background_xhr_browsertest.cc @@ -16,7 +16,8 @@ #include "net/base/escape.h" #include "net/base/url_util.h" #include "net/ssl/client_cert_store.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/ssl/ssl_server_config.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" namespace { @@ -63,20 +64,20 @@ IN_PROC_BROWSER_TEST_F(BackgroundXhrTest, TlsClientAuth) { loop.Run(); // Launch HTTPS server. - net::SpawnedTestServer::SSLOptions ssl_options; - ssl_options.request_client_certificate = true; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, ssl_options, - base::FilePath(FILE_PATH_LITERAL("content/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + net::SSLServerConfig ssl_config; + ssl_config.require_client_cert = true; + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_OK, ssl_config); + https_server.ServeFilesFromSourceDirectory("content/test/data"); ASSERT_TRUE(https_server.Start()); ASSERT_NO_FATAL_FAILURE( - RunTest("test_tls_client_auth.html", https_server.GetURL(""))); + RunTest("test_tls_client_auth.html", https_server.GetURL("/"))); } // Test that fetching a URL using HTTP auth doesn't crash, hang, or prompt. IN_PROC_BROWSER_TEST_F(BackgroundXhrTest, HttpAuth) { - ASSERT_TRUE(test_server()->Start()); - ASSERT_NO_FATAL_FAILURE( - RunTest("test_http_auth.html", test_server()->GetURL("auth-basic"))); + ASSERT_TRUE(embedded_test_server()->Start()); + ASSERT_NO_FATAL_FAILURE(RunTest( + "test_http_auth.html", embedded_test_server()->GetURL("/auth-basic"))); } diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc index d112f35..108d57b 100644 --- a/chrome/browser/extensions/chrome_app_api_browsertest.cc +++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc @@ -90,7 +90,7 @@ class ChromeAppAPITest : public ExtensionBrowserTest { IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL app_url = embedded_test_server()->GetURL("app.com", "/extensions/test_file.html"); GURL non_app_url = embedded_test_server()->GetURL( @@ -169,7 +169,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) { IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningState) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL app_url = embedded_test_server()->GetURL( "app.com", "/extensions/get_app_details_for_frame.html"); GURL non_app_url = embedded_test_server()->GetURL( @@ -226,7 +226,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningState) { IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningStateFrame) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL app_url = embedded_test_server()->GetURL( "app.com", "/extensions/get_app_details_for_frame_reversed.html"); diff --git a/chrome/browser/extensions/content_capabilities_browsertest.cc b/chrome/browser/extensions/content_capabilities_browsertest.cc index 23afca7..a33169c 100644 --- a/chrome/browser/extensions/content_capabilities_browsertest.cc +++ b/chrome/browser/extensions/content_capabilities_browsertest.cc @@ -99,7 +99,7 @@ class ContentCapabilitiesTest : public ExtensionApiTest { EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data)); embedded_test_server()->ServeFilesFromDirectory( test_data.AppendASCII("extensions/content_capabilities")); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); host_resolver()->AddRule("*", embedded_test_server()->base_url().host()); } diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc index d1f816c..a561187 100644 --- a/chrome/browser/extensions/content_script_apitest.cc +++ b/chrome/browser/extensions/content_script_apitest.cc @@ -367,7 +367,7 @@ IN_PROC_BROWSER_TEST_F( content::Source<Profile>(browser()->profile())); // Start with a renderer already open at a URL. - GURL url(test_server()->GetURL("file/extensions/test_file.html")); + GURL url(embedded_test_server()->GetURL("/extensions/test_file.html")); ui_test_utils::NavigateToURL(browser(), url); LoadExtension( diff --git a/chrome/browser/extensions/error_console/error_console_browsertest.cc b/chrome/browser/extensions/error_console/error_console_browsertest.cc index b8ef787..c14cbaf 100644 --- a/chrome/browser/extensions/error_console/error_console_browsertest.cc +++ b/chrome/browser/extensions/error_console/error_console_browsertest.cc @@ -221,7 +221,7 @@ class ErrorConsoleBrowserTest : public ExtensionBrowserTest { const GURL& GetTestURL() { if (test_url_.is_empty()) { - CHECK(embedded_test_server()->InitializeAndWaitUntilReady()); + CHECK(embedded_test_server()->Start()); test_url_ = embedded_test_server()->GetURL(kTestingPage); } return test_url_; diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index 261ee75..c039ba7 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc @@ -33,12 +33,11 @@ namespace { const char kTestCustomArg[] = "customArg"; -const char kTestServerPort[] = "testServer.port"; const char kTestDataDirectory[] = "testDataDirectory"; const char kTestWebSocketPort[] = "testWebSocketPort"; const char kSitePerProcess[] = "sitePerProcess"; const char kFtpServerPort[] = "ftpServer.port"; -const char kSpawnedTestServerPort[] = "spawnedTestServer.port"; +const char kEmbeddedTestServerPort[] = "testServer.port"; scoped_ptr<net::test_server::HttpResponse> HandleServerRedirectRequest( const net::test_server::HttpRequest& request) { @@ -370,13 +369,13 @@ const extensions::Extension* ExtensionApiTest::GetSingleLoadedExtension() { } bool ExtensionApiTest::StartEmbeddedTestServer() { - if (!embedded_test_server()->InitializeAndWaitUntilReady()) + if (!embedded_test_server()->Start()) return false; // Build a dictionary of values that tests can use to build URLs that // access the test server and local file system. Tests can see these values // using the extension API function chrome.test.getConfig(). - test_config_->SetInteger(kTestServerPort, + test_config_->SetInteger(kEmbeddedTestServerPort, embedded_test_server()->port()); return true; @@ -413,19 +412,6 @@ bool ExtensionApiTest::StartFTPServer(const base::FilePath& root_directory) { return true; } -bool ExtensionApiTest::StartSpawnedTestServer() { - if (!test_server()->Start()) - return false; - - // Build a dictionary of values that tests can use to build URLs that - // access the test server and local file system. Tests can see these values - // using the extension API function chrome.test.getConfig(). - test_config_->SetInteger(kSpawnedTestServerPort, - test_server()->host_port_pair().port()); - - return true; -} - void ExtensionApiTest::SetUpCommandLine(base::CommandLine* command_line) { ExtensionBrowserTest::SetUpCommandLine(command_line); test_data_dir_ = test_data_dir_.AppendASCII("api_test"); diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h index 3f03fd7..7b1a193 100644 --- a/chrome/browser/extensions/extension_apitest.h +++ b/chrome/browser/extensions/extension_apitest.h @@ -148,11 +148,6 @@ class ExtensionApiTest : public ExtensionBrowserTest { // chrome.test.getConfig(). bool StartFTPServer(const base::FilePath& root_directory); - // Start the spawned test server, and store details of its state. Those - // details will be available to javascript tests using - // chrome.test.getConfig(). - bool StartSpawnedTestServer(); - // Test that exactly one extension loaded. If so, return a pointer to // the extension. If not, return NULL and set message_. const extensions::Extension* GetSingleLoadedExtension(); diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc index 6985b54..c303164 100644 --- a/chrome/browser/extensions/extension_keybinding_apitest.cc +++ b/chrome/browser/extensions/extension_keybinding_apitest.cc @@ -29,6 +29,7 @@ #include "extensions/common/permissions/permissions_data.h" #include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" +#include "net/test/embedded_test_server/embedded_test_server.h" using content::WebContents; @@ -142,11 +143,11 @@ class CommandsApiTest : public ExtensionApiTest { #if defined(OS_CHROMEOS) void RunChromeOSConversionTest(const std::string& extension_path) { // Setup the environment. - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); ASSERT_TRUE(RunExtensionTest(extension_path)) << message_; ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL("files/extensions/test_file.txt")); + browser(), embedded_test_server()->GetURL("/extensions/test_file.txt")); ResultCatcher catcher; @@ -172,7 +173,7 @@ class CommandsApiTest : public ExtensionApiTest { // - The shortcut keys taken by one extension are not overwritten by the last // installed extension. IN_PROC_BROWSER_TEST_F(CommandsApiTest, Basic) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunExtensionTest("keybinding/basics")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; @@ -188,7 +189,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, Basic) { ASSERT_EQ(2, browser_actions_bar.NumberOfBrowserActions()); ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL("files/extensions/test_file.txt")); + browser(), embedded_test_server()->GetURL("/extensions/test_file.txt")); // activeTab shouldn't have been granted yet. WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); @@ -215,7 +216,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, Basic) { } IN_PROC_BROWSER_TEST_F(CommandsApiTest, PageAction) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunExtensionTest("keybinding/page_action")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; @@ -225,7 +226,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, PageAction) { // the page action icon. ResultCatcher catcher; ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL("files/extensions/test_file.txt")); + browser(), embedded_test_server()->GetURL("/extensions/test_file.txt")); ASSERT_TRUE(catcher.GetNextResult()); } @@ -251,7 +252,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, PageAction) { } IN_PROC_BROWSER_TEST_F(CommandsApiTest, PageActionKeyUpdated) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunExtensionTest("keybinding/page_action")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; @@ -266,7 +267,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, PageActionKeyUpdated) { // the page action icon. ResultCatcher catcher; ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL("files/extensions/test_file.txt")); + browser(), embedded_test_server()->GetURL("/extensions/test_file.txt")); ASSERT_TRUE(catcher.GetNextResult()); } @@ -285,21 +286,21 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, PageActionKeyUpdated) { // commands as well as synthesized ones and that inactive commands (like the // synthesized ones are in nature) have no shortcuts. IN_PROC_BROWSER_TEST_F(CommandsApiTest, SynthesizedCommand) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunExtensionTest("keybinding/synthesized")) << message_; } // This test validates that an extension cannot request a shortcut that is // already in use by Chrome. IN_PROC_BROWSER_TEST_F(CommandsApiTest, DontOverwriteSystemShortcuts) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); ASSERT_TRUE(RunExtensionTest("keybinding/dont_overwrite_system")) << message_; ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL("files/extensions/test_file.txt")); + browser(), embedded_test_server()->GetURL("/extensions/test_file.txt")); // Activate the regular shortcut (Alt+Shift+F). ExtensionTestMessageListener alt_shift_f_listener("alt_shift_f", false); @@ -345,7 +346,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, DontOverwriteSystemShortcuts) { // This test validates that an extension can remove the Chrome bookmark shortcut // if it has requested to do so. IN_PROC_BROWSER_TEST_F(CommandsApiTest, RemoveBookmarkShortcut) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); @@ -363,7 +364,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, RemoveBookmarkShortcut) { // shortcut without being given permission with a feature flag. IN_PROC_BROWSER_TEST_F(CommandsApiTest, RemoveBookmarkShortcutWithoutPermission) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); @@ -378,7 +379,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, // Ctrl+D shortcut (i.e. it does not trigger the overwrite functionality). IN_PROC_BROWSER_TEST_F(CommandsApiTest, RemoveBookmarkShortcutWithUserKeyBinding) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); @@ -406,7 +407,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, // This test validates that an extension can override the Chrome bookmark // shortcut if it has requested to do so. IN_PROC_BROWSER_TEST_F(CommandsApiTest, OverwriteBookmarkShortcut) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); @@ -418,7 +419,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, OverwriteBookmarkShortcut) { << message_; ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL("files/extensions/test_file.txt")); + browser(), embedded_test_server()->GetURL("/extensions/test_file.txt")); // Activate the shortcut (Ctrl+D) to send a test message. ExtensionTestMessageListener test_listener(false); // Won't reply. @@ -437,7 +438,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( "--enable-override-bookmarks-ui", "1"); - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_BOOKMARK_PAGE)); @@ -467,7 +468,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, // shortcut does not supersede the same keybinding by web pages. IN_PROC_BROWSER_TEST_F(CommandsApiTest, OverwriteBookmarkShortcutDoesNotOverrideWebKeybinding) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); @@ -479,9 +480,8 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, << message_; ui_test_utils::NavigateToURL( - browser(), - test_server()->GetURL( - "files/extensions/test_file_with_ctrl-d_keybinding.html")); + browser(), embedded_test_server()->GetURL( + "/extensions/test_file_with_ctrl-d_keybinding.html")); WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); ASSERT_TRUE(tab); @@ -499,7 +499,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, // web pages. IN_PROC_BROWSER_TEST_F(CommandsApiTest, OverwriteBookmarkShortcutByUserOverridesWebKeybinding) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); @@ -519,9 +519,8 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, kBookmarkKeybinding); ui_test_utils::NavigateToURL( - browser(), - test_server()->GetURL( - "files/extensions/test_file_with_ctrl-d_keybinding.html")); + browser(), embedded_test_server()->GetURL( + "/extensions/test_file_with_ctrl-d_keybinding.html")); ExtensionTestMessageListener test_listener(false); // Won't reply. // Activate the shortcut (Ctrl+D) which should be handled by the extension. @@ -914,11 +913,11 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, IN_PROC_BROWSER_TEST_F(CommandsApiTest, MAYBE_ContinuePropagation) { // Setup the environment. - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); ASSERT_TRUE(RunExtensionTest("keybinding/continue_propagation")) << message_; ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL("files/extensions/test_file.txt")); + browser(), embedded_test_server()->GetURL("/extensions/test_file.txt")); ResultCatcher catcher; @@ -958,7 +957,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, MAYBE_ChromeOSConversions) { // Make sure component extensions retain keybindings after removal then // re-adding. IN_PROC_BROWSER_TEST_F(CommandsApiTest, AddRemoveAddComponentExtension) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunComponentExtensionTest("keybinding/component")) << message_; extensions::ExtensionSystem::Get(browser()->profile()) diff --git a/chrome/browser/extensions/extension_loading_browsertest.cc b/chrome/browser/extensions/extension_loading_browsertest.cc index b828879..4e82ad1 100644 --- a/chrome/browser/extensions/extension_loading_browsertest.cc +++ b/chrome/browser/extensions/extension_loading_browsertest.cc @@ -33,7 +33,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionLoadingTest, UpgradeAfterNavigatingFromOverriddenNewTabPage) { embedded_test_server()->ServeFilesFromDirectory( base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); TestExtensionDir extension_dir; const char manifest_template[] = @@ -99,7 +99,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionLoadingTest, KeepAliveWithDevToolsOpenOnReload) { embedded_test_server()->ServeFilesFromDirectory( base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); TestExtensionDir extension_dir; const char manifest_contents[] = diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc index e203425..996e568 100644 --- a/chrome/browser/extensions/extension_messages_apitest.cc +++ b/chrome/browser/extensions/extension_messages_apitest.cc @@ -376,7 +376,7 @@ class ExternallyConnectableMessagingTest : public ExtensionApiTest { EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data)); embedded_test_server()->ServeFilesFromDirectory(test_data.AppendASCII( "extensions/api_test/messaging/externally_connectable/sites")); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); host_resolver()->AddRule("*", embedded_test_server()->base_url().host()); } diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc index 909c68f..20b2793 100644 --- a/chrome/browser/extensions/extension_nacl_browsertest.cc +++ b/chrome/browser/extensions/extension_nacl_browsertest.cc @@ -22,6 +22,7 @@ #include "content/public/test/browser_test_utils.h" #include "extensions/browser/extension_system.h" #include "net/dns/mock_host_resolver.h" +#include "net/test/embedded_test_server/embedded_test_server.h" using content::PluginService; using content::WebContents; @@ -147,7 +148,7 @@ class NaClExtensionTest : public ExtensionBrowserTest { // Test that the NaCl plugin isn't blocked for Webstore extensions. // Disabled: http://crbug.com/319892 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_WebStoreExtension) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = InstallExtension(INSTALL_TYPE_FROM_WEBSTORE); ASSERT_TRUE(extension); @@ -157,7 +158,7 @@ IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_WebStoreExtension) { // Test that the NaCl plugin is blocked for non-Webstore extensions. // Disabled: http://crbug.com/319892 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_NonWebStoreExtension) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = InstallExtension(INSTALL_TYPE_NON_WEBSTORE); ASSERT_TRUE(extension); @@ -167,7 +168,7 @@ IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_NonWebStoreExtension) { // Test that the NaCl plugin isn't blocked for component extensions. // Disabled: http://crbug.com/319892 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_ComponentExtension) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = InstallExtension(INSTALL_TYPE_COMPONENT); ASSERT_TRUE(extension); @@ -178,7 +179,7 @@ IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_ComponentExtension) { // Test that the NaCl plugin isn't blocked for unpacked extensions. // Disabled: http://crbug.com/319892 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_UnpackedExtension) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = InstallExtension(INSTALL_TYPE_UNPACKED); ASSERT_TRUE(extension); @@ -190,21 +191,22 @@ IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_UnpackedExtension) { // if it's a content (MIME type) handler. // Disabled: http://crbug.com/319892 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_NonExtensionScheme) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = InstallExtension(INSTALL_TYPE_FROM_WEBSTORE); ASSERT_TRUE(extension); CheckPluginsCreated( - test_server()->GetURL("files/extensions/native_client/test.html"), + embedded_test_server()->GetURL("/extensions/native_client/test.html"), PLUGIN_TYPE_CONTENT_HANDLER); } // Test that NaCl plugin isn't blocked for hosted app URLs. IN_PROC_BROWSER_TEST_F(NaClExtensionTest, HostedApp) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); - GURL url = test_server()->GetURL("files/extensions/native_client/test.html"); + GURL url = + embedded_test_server()->GetURL("/extensions/native_client/test.html"); GURL::Replacements replace_host; replace_host.SetHostStr("localhost"); replace_host.ClearPort(); diff --git a/chrome/browser/extensions/extension_request_limiting_throttle_browsertest.cc b/chrome/browser/extensions/extension_request_limiting_throttle_browsertest.cc index cff9345..369abcc 100644 --- a/chrome/browser/extensions/extension_request_limiting_throttle_browsertest.cc +++ b/chrome/browser/extensions/extension_request_limiting_throttle_browsertest.cc @@ -104,7 +104,7 @@ class ExtensionRequestLimitingThrottleBrowserTest // Requests to 127.0.0.1 bypass throttling, so set up a host resolver rule // to use a fake domain. host_resolver()->AddRule("www.example.com", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); extension_ = LoadExtension(test_data_dir_.AppendASCII("extension_throttle")); ASSERT_TRUE(extension_); diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc index 2f2fbf8..651bf93 100644 --- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc +++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc @@ -13,6 +13,7 @@ #include "content/public/test/browser_test_utils.h" #include "extensions/common/switches.h" #include "net/dns/mock_host_resolver.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" class ExtensionResourceRequestPolicyTest : public ExtensionApiTest { @@ -36,17 +37,16 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) { #endif host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtensionWithFlags(test_data_dir_ .AppendASCII("extension_resource_request_policy") .AppendASCII("extension"), // Tests manifest_version 1 behavior, so warnings are expected. ExtensionBrowserTest::kFlagIgnoreManifestWarnings)); - GURL web_resource( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "index.html")); + GURL web_resource(embedded_test_server()->GetURL( + "/extensions/api_test/extension_resource_request_policy/" + "index.html")); GURL::Replacements make_host_a_com; make_host_a_com.SetHostStr("a.com"); @@ -65,10 +65,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) { EXPECT_EQ(result, "Loaded"); // A web host that loads a non-existent extension. - GURL non_existent_extension( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "non_existent_extension.html")); + GURL non_existent_extension(embedded_test_server()->GetURL( + "/extensions/api_test/extension_resource_request_policy/" + "non_existent_extension.html")); ui_test_utils::NavigateToURL(browser(), non_existent_extension); ASSERT_TRUE(content::ExecuteScriptAndExtractString( browser()->tab_strip_model()->GetActiveWebContents(), @@ -154,15 +153,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, MAYBE_Video) { IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, MAYBE_WebAccessibleResources) { std::string result; - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension(test_data_dir_ .AppendASCII("extension_resource_request_policy") .AppendASCII("web_accessible"))); - GURL accessible_resource( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "web_accessible/accessible_resource.html")); + GURL accessible_resource(embedded_test_server()->GetURL( + "/extensions/api_test/extension_resource_request_policy/" + "web_accessible/accessible_resource.html")); ui_test_utils::NavigateToURL(browser(), accessible_resource); ASSERT_TRUE(content::ExecuteScriptAndExtractString( browser()->tab_strip_model()->GetActiveWebContents(), @@ -170,10 +168,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, &result)); EXPECT_EQ("Loaded", result); - GURL xhr_accessible_resource( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "web_accessible/xhr_accessible_resource.html")); + GURL xhr_accessible_resource(embedded_test_server()->GetURL( + "/extensions/api_test/extension_resource_request_policy/" + "web_accessible/xhr_accessible_resource.html")); ui_test_utils::NavigateToURL( browser(), xhr_accessible_resource); ASSERT_TRUE(content::ExecuteScriptAndExtractString( @@ -182,10 +179,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, &result)); EXPECT_EQ("XHR completed with status: 200", result); - GURL xhr_inaccessible_resource( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "web_accessible/xhr_inaccessible_resource.html")); + GURL xhr_inaccessible_resource(embedded_test_server()->GetURL( + "/extensions/api_test/extension_resource_request_policy/" + "web_accessible/xhr_inaccessible_resource.html")); ui_test_utils::NavigateToURL( browser(), xhr_inaccessible_resource); ASSERT_TRUE(content::ExecuteScriptAndExtractString( @@ -194,10 +190,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, &result)); EXPECT_EQ("XHR failed to load resource", result); - GURL nonaccessible_resource( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "web_accessible/nonaccessible_resource.html")); + GURL nonaccessible_resource(embedded_test_server()->GetURL( + "/extensions/api_test/extension_resource_request_policy/" + "web_accessible/nonaccessible_resource.html")); ui_test_utils::NavigateToURL(browser(), nonaccessible_resource); ASSERT_TRUE(content::ExecuteScriptAndExtractString( browser()->tab_strip_model()->GetActiveWebContents(), @@ -205,10 +200,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, &result)); EXPECT_EQ("Image failed to load", result); - GURL nonexistent_resource( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "web_accessible/nonexistent_resource.html")); + GURL nonexistent_resource(embedded_test_server()->GetURL( + "/extensions/api_test/extension_resource_request_policy/" + "web_accessible/nonexistent_resource.html")); ui_test_utils::NavigateToURL(browser(), nonexistent_resource); ASSERT_TRUE(content::ExecuteScriptAndExtractString( browser()->tab_strip_model()->GetActiveWebContents(), @@ -216,10 +210,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, &result)); EXPECT_EQ("Image failed to load", result); - GURL nonaccessible_cer_resource( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "web_accessible/nonaccessible_chrome_resource_scheme.html")); + GURL nonaccessible_cer_resource(embedded_test_server()->GetURL( + "/extensions/api_test/extension_resource_request_policy/" + "web_accessible/nonaccessible_chrome_resource_scheme.html")); ui_test_utils::NavigateToURL(browser(), nonaccessible_cer_resource); ASSERT_TRUE(content::ExecuteScriptAndExtractString( browser()->tab_strip_model()->GetActiveWebContents(), @@ -228,10 +221,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, EXPECT_EQ("Loading CER:// failed.", result); GURL newtab_page("chrome://newtab"); - GURL accessible_newtab_override( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "web_accessible/accessible_history_navigation.html")); + GURL accessible_newtab_override(embedded_test_server()->GetURL( + "/extensions/api_test/extension_resource_request_policy/" + "web_accessible/accessible_history_navigation.html")); ui_test_utils::NavigateToURL(browser(), newtab_page); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( browser(), accessible_newtab_override, 2); @@ -245,15 +237,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, LinkToWebAccessibleResources) { std::string result; - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension(test_data_dir_ .AppendASCII("extension_resource_request_policy") .AppendASCII("web_accessible"))); - GURL accessible_linked_resource( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "web_accessible/accessible_link_resource.html")); + GURL accessible_linked_resource(embedded_test_server()->GetURL( + "/extensions/api_test/extension_resource_request_policy/" + "web_accessible/accessible_link_resource.html")); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), accessible_linked_resource, 2); ASSERT_TRUE(content::ExecuteScriptAndExtractString( @@ -262,10 +253,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, &result)); EXPECT_NE("about:blank", result); - GURL nonaccessible_linked_resource( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "web_accessible/nonaccessible_link_resource.html")); + GURL nonaccessible_linked_resource(embedded_test_server()->GetURL( + "/extensions/api_test/extension_resource_request_policy/" + "web_accessible/nonaccessible_link_resource.html")); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), nonaccessible_linked_resource, 2); ASSERT_TRUE(content::ExecuteScriptAndExtractString( @@ -274,10 +264,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, &result)); EXPECT_EQ("about:blank", result); - GURL accessible_client_redirect_resource( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "web_accessible/accessible_redirect_resource.html")); + GURL accessible_client_redirect_resource(embedded_test_server()->GetURL( + "/extensions/api_test/extension_resource_request_policy/" + "web_accessible/accessible_redirect_resource.html")); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), accessible_client_redirect_resource, 2); ASSERT_TRUE(content::ExecuteScriptAndExtractString( @@ -286,10 +275,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, &result)); EXPECT_NE("about:blank", result); - GURL nonaccessible_client_redirect_resource( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "web_accessible/nonaccessible_redirect_resource.html")); + GURL nonaccessible_client_redirect_resource(embedded_test_server()->GetURL( + "/extensions/api_test/extension_resource_request_policy/" + "web_accessible/nonaccessible_redirect_resource.html")); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), nonaccessible_client_redirect_resource, 2); ASSERT_TRUE(content::ExecuteScriptAndExtractString( @@ -302,15 +290,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, WebAccessibleResourcesWithCSP) { std::string result; - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension(test_data_dir_ .AppendASCII("extension_resource_request_policy") .AppendASCII("web_accessible"))); - GURL accessible_resource_with_csp( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "web_accessible/accessible_resource_with_csp.html")); + GURL accessible_resource_with_csp(embedded_test_server()->GetURL( + "/extensions/api_test/extension_resource_request_policy/" + "web_accessible/accessible_resource_with_csp.html")); ui_test_utils::NavigateToURL(browser(), accessible_resource_with_csp); ASSERT_TRUE(content::ExecuteScriptAndExtractString( browser()->tab_strip_model()->GetActiveWebContents(), diff --git a/chrome/browser/extensions/external_provider_impl_unittest.cc b/chrome/browser/extensions/external_provider_impl_unittest.cc index 43962c9..a833f58 100644 --- a/chrome/browser/extensions/external_provider_impl_unittest.cc +++ b/chrome/browser/extensions/external_provider_impl_unittest.cc @@ -98,7 +98,7 @@ class ExternalProviderImplTest : public ExtensionServiceTestBase { ExtensionServiceTestBase::SetUp(); test_server_.reset(new EmbeddedTestServer()); - ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady()); + ASSERT_TRUE(test_server_->Start()); test_server_->RegisterRequestHandler( base::Bind(&ExternalProviderImplTest::HandleRequest, base::Unretained(this))); diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc index 9ff3f0d..255cda6 100644 --- a/chrome/browser/extensions/isolated_app_browsertest.cc +++ b/chrome/browser/extensions/isolated_app_browsertest.cc @@ -41,7 +41,7 @@ std::string WrapForJavascriptAndExtract(const char* javascript_expression) { } scoped_ptr<net::test_server::HttpResponse> HandleExpectAndSetCookieRequest( - const net::test_server::EmbeddedTestServer* test_server, + const net::EmbeddedTestServer* test_server, const net::test_server::HttpRequest& request) { if (!base::StartsWith(request.relative_url, "/expect-and-set-cookie?", base::CompareCase::SENSITIVE)) @@ -136,7 +136,7 @@ class IsolatedAppTest : public ExtensionBrowserTest { IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CrossProcessClientRedirect) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1"))); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2"))); @@ -205,7 +205,7 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CrossProcessClientRedirect) { #endif IN_PROC_BROWSER_TEST_F(IsolatedAppTest, MAYBE_CookieIsolation) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1"))); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2"))); @@ -300,7 +300,7 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, MAYBE_CookieIsolation) { // Ensure that cookies are not isolated if the isolated apps are not installed. IN_PROC_BROWSER_TEST_F(IsolatedAppTest, DISABLED_NoCookieIsolationWithoutApp) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // The app under test acts on URLs whose host is "localhost", // so the URLs we navigate to must have host "localhost". @@ -379,7 +379,7 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, MAYBE_SubresourceCookieIsolation) { base::Bind(&HandleExpectAndSetCookieRequest, embedded_test_server())); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1"))); @@ -451,7 +451,7 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, MAYBE_SubresourceCookieIsolation) { // where non-app popups may be kept in the hosted app process. IN_PROC_BROWSER_TEST_F(IsolatedAppTest, MAYBE_IsolatedAppProcessModel) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1"))); @@ -508,7 +508,7 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, MAYBE_IsolatedAppProcessModel) { // removed. http://crbug.com/159932 IN_PROC_BROWSER_TEST_F(IsolatedAppTest, DISABLED_SessionStorage) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1"))); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2"))); diff --git a/chrome/browser/extensions/page_action_browsertest.cc b/chrome/browser/extensions/page_action_browsertest.cc index c0cebef..fe0b60b 100644 --- a/chrome/browser/extensions/page_action_browsertest.cc +++ b/chrome/browser/extensions/page_action_browsertest.cc @@ -15,23 +15,24 @@ #include "extensions/browser/extension_registry.h" #include "extensions/common/extension.h" #include "extensions/common/switches.h" +#include "net/test/embedded_test_server/embedded_test_server.h" namespace extensions { namespace { -const std::string kFeedPage = "files/feeds/feed.html"; -const std::string kNoFeedPage = "files/feeds/no_feed.html"; +const std::string kFeedPage = "/feeds/feed.html"; +const std::string kNoFeedPage = "/feeds/no_feed.html"; const std::string kLocalization = - "files/extensions/browsertest/title_localized_pa/simple.html"; + "/extensions/browsertest/title_localized_pa/simple.html"; const std::string kHashPageA = - "files/extensions/api_test/page_action/hash_change/test_page_A.html"; + "/extensions/api_test/page_action/hash_change/test_page_A.html"; const std::string kHashPageAHash = kHashPageA + "#asdf"; const std::string kHashPageB = - "files/extensions/api_test/page_action/hash_change/test_page_B.html"; + "/extensions/api_test/page_action/hash_change/test_page_B.html"; IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionCrash25562) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); base::CommandLine::ForCurrentProcess()->AppendSwitch( switches::kAllowLegacyExtensionManifests); @@ -43,7 +44,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionCrash25562) { .AppendASCII("crash_25562"))); // Navigate to the feed page. - GURL feed_url = test_server()->GetURL(kFeedPage); + GURL feed_url = embedded_test_server()->GetURL(kFeedPage); ui_test_utils::NavigateToURL(browser(), feed_url); // We should now have one page action ready to go in the LocationBar. ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1)); @@ -51,7 +52,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionCrash25562) { // Tests that we can load page actions in the Omnibox. IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageAction) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action"))); @@ -59,13 +60,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageAction) { ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0)); // Navigate to the feed page. - GURL feed_url = test_server()->GetURL(kFeedPage); + GURL feed_url = embedded_test_server()->GetURL(kFeedPage); ui_test_utils::NavigateToURL(browser(), feed_url); // We should now have one page action ready to go in the LocationBar. ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1)); // Navigate to a page with no feed. - GURL no_feed = test_server()->GetURL(kNoFeedPage); + GURL no_feed = embedded_test_server()->GetURL(kNoFeedPage); ui_test_utils::NavigateToURL(browser(), no_feed); // Make sure the page action goes away. ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0)); @@ -73,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageAction) { // Tests that we don't lose the page action icon on in-page navigations. IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionInPageNavigation) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); base::FilePath extension_path(test_data_dir_.AppendASCII("api_test") .AppendASCII("page_action") @@ -81,31 +82,31 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionInPageNavigation) { ASSERT_TRUE(LoadExtension(extension_path)); // Page action should become visible when we navigate here. - GURL feed_url = test_server()->GetURL(kHashPageA); + GURL feed_url = embedded_test_server()->GetURL(kHashPageA); ui_test_utils::NavigateToURL(browser(), feed_url); ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1)); // In-page navigation, page action should remain. - feed_url = test_server()->GetURL(kHashPageAHash); + feed_url = embedded_test_server()->GetURL(kHashPageAHash); ui_test_utils::NavigateToURL(browser(), feed_url); ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1)); // Not an in-page navigation, page action should go away. - feed_url = test_server()->GetURL(kHashPageB); + feed_url = embedded_test_server()->GetURL(kHashPageB); ui_test_utils::NavigateToURL(browser(), feed_url); ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0)); } // Tests that the location bar forgets about unloaded page actions. IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, UnloadPageAction) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); base::FilePath extension_path( test_data_dir_.AppendASCII("subscribe_page_action")); ASSERT_TRUE(LoadExtension(extension_path)); // Navigation prompts the location bar to load page actions. - GURL feed_url = test_server()->GetURL(kFeedPage); + GURL feed_url = embedded_test_server()->GetURL(kFeedPage); ui_test_utils::NavigateToURL(browser(), feed_url); content::WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); @@ -175,7 +176,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionRefreshCrash) { // Tests that tooltips of a page action icon can be specified using UTF8. // See http://crbug.com/25349. IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationPageAction) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ExtensionRegistry* registry = extensions::ExtensionRegistry::Get(browser()->profile()); @@ -187,7 +188,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationPageAction) { ASSERT_TRUE(extension); // Any navigation prompts the location bar to load the page action. - GURL url = test_server()->GetURL(kLocalization); + GURL url = embedded_test_server()->GetURL(kLocalization); ui_test_utils::NavigateToURL(browser(), url); ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1)); diff --git a/chrome/browser/extensions/process_management_browsertest.cc b/chrome/browser/extensions/process_management_browsertest.cc index 67ef9e8..46b49c9 100644 --- a/chrome/browser/extensions/process_management_browsertest.cc +++ b/chrome/browser/extensions/process_management_browsertest.cc @@ -54,7 +54,7 @@ IN_PROC_BROWSER_TEST_F(ProcessManagementTest, MAYBE_ProcessOverflow) { content::RenderProcessHost::SetMaxRendererProcessCount(1); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1"))); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2"))); @@ -192,7 +192,7 @@ IN_PROC_BROWSER_TEST_F(ProcessManagementTest, MAYBE_ExtensionProcessBalancing) { content::RenderProcessHost::SetMaxRendererProcessCount(6); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // The app under test acts on URLs whose host is "localhost", // so the URLs we navigate to must have host "localhost". diff --git a/chrome/browser/extensions/process_manager_browsertest.cc b/chrome/browser/extensions/process_manager_browsertest.cc index 980318c..3596cbc 100644 --- a/chrome/browser/extensions/process_manager_browsertest.cc +++ b/chrome/browser/extensions/process_manager_browsertest.cc @@ -126,7 +126,7 @@ IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, HttpHostMatchingExtensionId) { ASSERT_TRUE(extension.get()); const std::string& aliased_host = extension->id(); host_resolver()->AddRule(aliased_host, "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL url = embedded_test_server()->GetURL("/extensions/test_file_with_body.html"); GURL::Replacements replace_host; diff --git a/chrome/browser/extensions/stubs_apitest.cc b/chrome/browser/extensions/stubs_apitest.cc index 052a2db..4361260 100644 --- a/chrome/browser/extensions/stubs_apitest.cc +++ b/chrome/browser/extensions/stubs_apitest.cc @@ -18,7 +18,7 @@ #define MAYBE_Stubs Stubs #endif IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Stubs) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunExtensionTest("stubs")) << message_; diff --git a/chrome/browser/extensions/subscribe_page_action_browsertest.cc b/chrome/browser/extensions/subscribe_page_action_browsertest.cc index 1e9c7b6..c257c5c 100644 --- a/chrome/browser/extensions/subscribe_page_action_browsertest.cc +++ b/chrome/browser/extensions/subscribe_page_action_browsertest.cc @@ -11,6 +11,7 @@ #include "content/public/test/browser_test_utils.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" +#include "net/test/embedded_test_server/embedded_test_server.h" using content::WebContents; using extensions::Extension; @@ -18,21 +19,21 @@ using extensions::Extension; namespace { const char kSubscribePage[] = "/subscribe.html"; -const char kFeedPageMultiRel[] = "files/feeds/feed_multi_rel.html"; -const char kValidFeedNoLinks[] = "files/feeds/feed_nolinks.xml"; -const char kValidFeed0[] = "files/feeds/feed_script.xml"; -const char kValidFeed1[] = "files/feeds/feed1.xml"; -const char kValidFeed2[] = "files/feeds/feed2.xml"; -const char kValidFeed3[] = "files/feeds/feed3.xml"; -const char kValidFeed4[] = "files/feeds/feed4.xml"; -const char kValidFeed5[] = "files/feeds/feed5.xml"; -const char kValidFeed6[] = "files/feeds/feed6.xml"; -const char kInvalidFeed1[] = "files/feeds/feed_invalid1.xml"; -const char kInvalidFeed2[] = "files/feeds/feed_invalid2.xml"; +const char kFeedPageMultiRel[] = "/feeds/feed_multi_rel.html"; +const char kValidFeedNoLinks[] = "/feeds/feed_nolinks.xml"; +const char kValidFeed0[] = "/feeds/feed_script.xml"; +const char kValidFeed1[] = "/feeds/feed1.xml"; +const char kValidFeed2[] = "/feeds/feed2.xml"; +const char kValidFeed3[] = "/feeds/feed3.xml"; +const char kValidFeed4[] = "/feeds/feed4.xml"; +const char kValidFeed5[] = "/feeds/feed5.xml"; +const char kValidFeed6[] = "/feeds/feed6.xml"; +const char kInvalidFeed1[] = "/feeds/feed_invalid1.xml"; +const char kInvalidFeed2[] = "/feeds/feed_invalid2.xml"; // We need a triple encoded string to prove that we are not decoding twice in // subscribe.js because one layer is also stripped off when subscribe.js passes // it to the XMLHttpRequest object. -const char kFeedTripleEncoded[] = "files/feeds/url%25255Fdecoding.html"; +const char kFeedTripleEncoded[] = "/feeds/url%25255Fdecoding.html"; static const char kScriptFeedTitle[] = "window.domAutomationController.send(" @@ -59,8 +60,10 @@ static const char kScriptError[] = " \"No error\"" ");"; -GURL GetFeedUrl(net::SpawnedTestServer* server, const std::string& feed_page, - bool direct_url, std::string extension_id) { +GURL GetFeedUrl(net::EmbeddedTestServer* server, + const std::string& feed_page, + bool direct_url, + std::string extension_id) { GURL feed_url = server->GetURL(feed_page); if (direct_url) { // We navigate directly to the subscribe page for feeds where the feed @@ -94,7 +97,7 @@ bool ValidatePageElement(content::RenderFrameHost* frame, // 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::SpawnedTestServer* server, +void NavigateToFeedAndValidate(net::EmbeddedTestServer* server, const std::string& url, Browser* browser, std::string extension_id, @@ -126,7 +129,7 @@ void NavigateToFeedAndValidate(net::SpawnedTestServer* server, // Makes sure that the RSS detects RSS feed links, even when rel tag contains // more than just "alternate". IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSMultiRelLink) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action"))); @@ -134,7 +137,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSMultiRelLink) { ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0)); // Navigate to the feed page. - GURL feed_url = test_server()->GetURL(kFeedPageMultiRel); + GURL feed_url = embedded_test_server()->GetURL(kFeedPageMultiRel); ui_test_utils::NavigateToURL(browser(), feed_url); // We should now have one page action ready to go in the LocationBar. ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1)); @@ -142,71 +145,64 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSMultiRelLink) { // This test is flaky on all platforms; see http://crbug.com/340354 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_RSSParseFeedValidFeed1) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action")); ASSERT_TRUE(extension); std::string id = extension->id(); - NavigateToFeedAndValidate(test_server(), kValidFeed1, browser(), id, true, - "Feed for MyFeedTitle", - "Title 1", - "Desc", + NavigateToFeedAndValidate(embedded_test_server(), kValidFeed1, browser(), id, + true, "Feed for MyFeedTitle", "Title 1", "Desc", "No error"); } // This test is flaky on all platforms; see http://crbug.com/340354 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_RSSParseFeedValidFeed2) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action")); ASSERT_TRUE(extension); std::string id = extension->id(); - NavigateToFeedAndValidate(test_server(), kValidFeed2, browser(), id, true, - "Feed for MyFeed2", - "My item title1", - "This is a summary.", - "No error"); + NavigateToFeedAndValidate(embedded_test_server(), kValidFeed2, browser(), id, + true, "Feed for MyFeed2", "My item title1", + "This is a summary.", "No error"); } // This test is flaky on all platforms; see http://crbug.com/340354 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_RSSParseFeedValidFeed3) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action")); ASSERT_TRUE(extension); std::string id = extension->id(); - NavigateToFeedAndValidate(test_server(), kValidFeed3, browser(), id, true, - "Feed for Google Code buglist rss feed", - "My dear title", - "My dear content", - "No error"); + NavigateToFeedAndValidate(embedded_test_server(), kValidFeed3, browser(), id, + true, "Feed for Google Code buglist rss feed", + "My dear title", "My dear content", "No error"); } // This test is flaky on all platforms; see http://crbug.com/340354 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_RSSParseFeedValidFeed4) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action")); ASSERT_TRUE(extension); std::string id = extension->id(); - NavigateToFeedAndValidate(test_server(), kValidFeed4, browser(), id, true, - "Feed for Title chars <script> %23 stop", - "Title chars %23 stop", - "My dear content %23 stop", + NavigateToFeedAndValidate(embedded_test_server(), kValidFeed4, browser(), id, + true, "Feed for Title chars <script> %23 stop", + "Title chars %23 stop", "My dear content %23 stop", "No error"); } // This test is flaky on all platforms; see http://crbug.com/340354 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_RSSParseFeedValidFeed0) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action")); @@ -215,16 +211,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_RSSParseFeedValidFeed0) { // Try a feed with a link with an onclick handler (before r27440 this would // trigger a NOTREACHED). - NavigateToFeedAndValidate(test_server(), kValidFeed0, browser(), id, true, - "Feed for MyFeedTitle", - "Title 1", - "Desc VIDEO", - "No error"); + NavigateToFeedAndValidate(embedded_test_server(), kValidFeed0, browser(), id, + true, "Feed for MyFeedTitle", "Title 1", + "Desc VIDEO", "No error"); } // This test is flaky on all platforms; see http://crbug.com/340354 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_RSSParseFeedValidFeed5) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action")); @@ -232,16 +226,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_RSSParseFeedValidFeed5) { std::string id = extension->id(); // Feed with valid but mostly empty xml. - NavigateToFeedAndValidate(test_server(), kValidFeed5, browser(), id, true, - "Feed for Unknown feed name", - "element 'anchor_0' not found", - "element 'desc_0' not found", - "This feed contains no entries."); + NavigateToFeedAndValidate( + embedded_test_server(), kValidFeed5, browser(), id, true, + "Feed for Unknown feed name", "element 'anchor_0' not found", + "element 'desc_0' not found", "This feed contains no entries."); } // This test is flaky on all platforms; see http://crbug.com/340354 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_RSSParseFeedValidFeed6) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action")); @@ -249,15 +242,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_RSSParseFeedValidFeed6) { std::string id = extension->id(); // Feed that is technically invalid but still parseable. - NavigateToFeedAndValidate(test_server(), kValidFeed6, browser(), id, true, - "Feed for MyFeedTitle", - "Title 1", - "Desc", + NavigateToFeedAndValidate(embedded_test_server(), kValidFeed6, browser(), id, + true, "Feed for MyFeedTitle", "Title 1", "Desc", "No error"); } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSParseFeedInvalidFeed1) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action")); @@ -265,15 +256,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSParseFeedInvalidFeed1) { std::string id = extension->id(); // Try an empty feed. - NavigateToFeedAndValidate(test_server(), kInvalidFeed1, browser(), id, false, - "Feed for Unknown feed name", - "element 'anchor_0' not found", - "element 'desc_0' not found", - "This feed contains no entries."); + NavigateToFeedAndValidate( + embedded_test_server(), kInvalidFeed1, browser(), id, false, + "Feed for Unknown feed name", "element 'anchor_0' not found", + "element 'desc_0' not found", "This feed contains no entries."); } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSParseFeedInvalidFeed2) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action")); @@ -281,15 +271,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSParseFeedInvalidFeed2) { std::string id = extension->id(); // Try a garbage feed. - NavigateToFeedAndValidate(test_server(), kInvalidFeed2, browser(), id, false, - "Feed for Unknown feed name", - "element 'anchor_0' not found", - "element 'desc_0' not found", - "This feed contains no entries."); + NavigateToFeedAndValidate( + embedded_test_server(), kInvalidFeed2, browser(), id, false, + "Feed for Unknown feed name", "element 'anchor_0' not found", + "element 'desc_0' not found", "This feed contains no entries."); } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSParseFeedInvalidFeed3) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action")); @@ -297,15 +286,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSParseFeedInvalidFeed3) { std::string id = extension->id(); // Try a feed that doesn't exist. - NavigateToFeedAndValidate(test_server(), "foo.xml", browser(), id, false, - "Feed for Unknown feed name", - "element 'anchor_0' not found", - "element 'desc_0' not found", - "This feed contains no entries."); + NavigateToFeedAndValidate( + embedded_test_server(), "/foo.xml", browser(), id, false, + "Feed for Unknown feed name", "element 'anchor_0' not found", + "element 'desc_0' not found", "This feed contains no entries."); } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSParseFeedInvalidFeed4) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action")); @@ -320,17 +308,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSParseFeedInvalidFeed4) { // we start erroneously double decoding again, the path (and the feed) will // become valid resulting in a failure for this test. NavigateToFeedAndValidate( - test_server(), kFeedTripleEncoded, browser(), id, true, - "Feed for Unknown feed name", - "element 'anchor_0' not found", - "element 'desc_0' not found", - "This feed contains no entries."); + embedded_test_server(), kFeedTripleEncoded, browser(), id, true, + "Feed for Unknown feed name", "element 'anchor_0' not found", + "element 'desc_0' not found", "This feed contains no entries."); } // This test is flaky on all platforms; see http://crbug.com/340354 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_RSSParseFeedValidFeedNoLinks) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const Extension* extension = LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action")); @@ -338,10 +324,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, std::string id = extension->id(); // Valid feed but containing no links. - NavigateToFeedAndValidate( - test_server(), kValidFeedNoLinks, browser(), id, true, - "Feed for MyFeedTitle", - "Title with no link", - "Desc", - "No error"); + NavigateToFeedAndValidate(embedded_test_server(), kValidFeedNoLinks, + browser(), id, true, "Feed for MyFeedTitle", + "Title with no link", "Desc", "No error"); } diff --git a/chrome/browser/extensions/wake_event_page_apitest.cc b/chrome/browser/extensions/wake_event_page_apitest.cc index dbe5f66..8f95d81 100644 --- a/chrome/browser/extensions/wake_event_page_apitest.cc +++ b/chrome/browser/extensions/wake_event_page_apitest.cc @@ -69,7 +69,7 @@ class WakeEventPageTest : public ExtensionBrowserTest { BackgroundPageConfiguration bg_config, bool should_close, bool will_be_open) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL web_url = embedded_test_server()->GetURL("example.com", "/empty.html"); host_resolver()->AddRule(web_url.host(), "127.0.0.1"); diff --git a/chrome/browser/extensions/webstore_installer_test.cc b/chrome/browser/extensions/webstore_installer_test.cc index f5bb127..d2e0eaf 100644 --- a/chrome/browser/extensions/webstore_installer_test.cc +++ b/chrome/browser/extensions/webstore_installer_test.cc @@ -27,6 +27,7 @@ #include "content/public/test/browser_test_utils.h" #include "net/base/host_port_pair.h" #include "net/dns/mock_host_resolver.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" using content::WebContents; @@ -55,12 +56,12 @@ void WebstoreInstallerTest::SetUpCommandLine(base::CommandLine* command_line) { ExtensionBrowserTest::SetUpCommandLine(command_line); // We start the test server now instead of in // SetUpInProcessBrowserTestFixture so that we can get its port number. - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); - net::HostPortPair host_port = test_server()->host_port_pair(); - test_gallery_url_ = base::StringPrintf( - "http://%s:%d/files/%s", - webstore_domain_.c_str(), host_port.port(), test_data_path_.c_str()); + net::HostPortPair host_port = embedded_test_server()->host_port_pair(); + test_gallery_url_ = + base::StringPrintf("http://%s:%d/%s", webstore_domain_.c_str(), + host_port.port(), test_data_path_.c_str()); command_line->AppendSwitchASCII( switches::kAppsGalleryURL, test_gallery_url_); @@ -90,10 +91,8 @@ void WebstoreInstallerTest::SetUpOnMainThread() { GURL WebstoreInstallerTest::GenerateTestServerUrl( const std::string& domain, const std::string& page_filename) { - GURL page_url = test_server()->GetURL( - base::StringPrintf("files/%s/%s", - test_data_path_.c_str(), - page_filename.c_str())); + GURL page_url = embedded_test_server()->GetURL(base::StringPrintf( + "/%s/%s", test_data_path_.c_str(), page_filename.c_str())); GURL::Replacements replace_host; replace_host.SetHostStr(domain); diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index f7c0239..28d5dac 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -194,7 +194,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_PopupBlockingExtension) { IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PopupBlockingHostedApp) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("window_open").AppendASCII("popup_blocking") @@ -207,14 +207,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PopupBlockingHostedApp) { replace_host.SetHostStr("a.com"); const std::string popup_app_contents_path( - "files/extensions/api_test/window_open/popup_blocking/hosted_app/"); - - GURL open_tab = - test_server()->GetURL(popup_app_contents_path + "open_tab.html") - .ReplaceComponents(replace_host); - GURL open_popup = - test_server()->GetURL(popup_app_contents_path + "open_popup.html") - .ReplaceComponents(replace_host); + "/extensions/api_test/window_open/popup_blocking/hosted_app/"); + + GURL open_tab = embedded_test_server() + ->GetURL(popup_app_contents_path + "open_tab.html") + .ReplaceComponents(replace_host); + GURL open_popup = embedded_test_server() + ->GetURL(popup_app_contents_path + "open_popup.html") + .ReplaceComponents(replace_host); browser()->OpenURL(OpenURLParams( open_tab, Referrer(), NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED, diff --git a/chrome/browser/external_extension_browsertest.cc b/chrome/browser/external_extension_browsertest.cc index 5a0022c..a9c2164 100644 --- a/chrome/browser/external_extension_browsertest.cc +++ b/chrome/browser/external_extension_browsertest.cc @@ -17,7 +17,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/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" namespace { @@ -40,11 +40,11 @@ class SearchProviderTest : public InProcessBrowserTest { SearchProviderTest() {} void SetUpCommandLine(base::CommandLine* command_line) override { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Map all hosts to our local server. - std::string host_rule( - "MAP * " + test_server()->host_port_pair().ToString()); + std::string host_rule("MAP * " + + embedded_test_server()->host_port_pair().ToString()); command_line->AppendSwitchASCII(switches::kHostRules, host_rule); // Use no proxy or otherwise this test will fail on a machine that has a // proxy configured. @@ -57,7 +57,7 @@ class SearchProviderTest : public InProcessBrowserTest { // Get the url for the test page. search_provider_test_url_ = - test_server()->GetURL("files/is_search_provider_installed.html"); + embedded_test_server()->GetURL("/is_search_provider_installed.html"); } void SetUpOnMainThread() override { @@ -153,8 +153,8 @@ IN_PROC_BROWSER_TEST_F(SearchProviderTest, TestIsSearchProviderInstalledWithException) { // Change the url for the test page to one that throws an exception when // toString is called on the argument given to isSearchProviderInstalled. - search_provider_test_url_ = test_server()->GetURL( - "files/is_search_provider_installed_with_exception.html"); + search_provider_test_url_ = embedded_test_server()->GetURL( + "/is_search_provider_installed_with_exception.html"); FinishIsSearchProviderInstalledTest(StartIsSearchProviderInstalledTest( browser(), "www.google.com", "")); diff --git a/chrome/browser/fast_shutdown_browsertest.cc b/chrome/browser/fast_shutdown_browsertest.cc index 33481c3..3a73d30 100644 --- a/chrome/browser/fast_shutdown_browsertest.cc +++ b/chrome/browser/fast_shutdown_browsertest.cc @@ -18,6 +18,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" +#include "net/test/embedded_test_server/embedded_test_server.h" using content::BrowserThread; @@ -41,9 +42,9 @@ class FastShutdown : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(FastShutdown, DISABLED_SlowTermination) { // Need to run these tests on http:// since we only allow cookies on that (and // https obviously). - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // This page has an unload handler. - GURL url = test_server()->GetURL("files/fast_shutdown/on_unloader.html"); + GURL url = embedded_test_server()->GetURL("/fast_shutdown/on_unloader.html"); EXPECT_EQ("", content::GetCookies(browser()->profile(), url)); content::WindowedNotificationObserver window_observer( diff --git a/chrome/browser/favicon/content_favicon_driver_browsertest.cc b/chrome/browser/favicon/content_favicon_driver_browsertest.cc index 4ba0645..9c9767b 100644 --- a/chrome/browser/favicon/content_favicon_driver_browsertest.cc +++ b/chrome/browser/favicon/content_favicon_driver_browsertest.cc @@ -25,7 +25,7 @@ #include "content/public/browser/resource_dispatcher_host.h" #include "content/public/browser/resource_dispatcher_host_delegate.h" #include "net/base/load_flags.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/url_request/url_request.h" #include "url/url_constants.h" @@ -203,9 +203,9 @@ class ContentFaviconDriverTest : public InProcessBrowserTest, // is redownloaded and (not returned from either the favicon cache or the HTTP // cache). IN_PROC_BROWSER_TEST_F(ContentFaviconDriverTest, ReloadIgnoringCache) { - ASSERT_TRUE(test_server()->Start()); - GURL url = test_server()->GetURL("files/favicon/page_with_favicon.html"); - GURL icon_url = test_server()->GetURL("files/favicon/icon.png"); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL url = embedded_test_server()->GetURL("/favicon/page_with_favicon.html"); + GURL icon_url = embedded_test_server()->GetURL("/favicon/icon.png"); scoped_ptr<TestResourceDispatcherHostDelegate> delegate( new TestResourceDispatcherHostDelegate(icon_url)); diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index c8ff648..52b0ce5 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -294,8 +294,7 @@ void GeolocationBrowserTest::TearDownInProcessBrowserTestFixture() { } void GeolocationBrowserTest::Initialize(InitializationOptions options) { - if (!embedded_test_server()->Started() && - !embedded_test_server()->InitializeAndWaitUntilReady()) { + if (!embedded_test_server()->Started() && !embedded_test_server()->Start()) { ADD_FAILURE() << "Test server failed to start."; return; } diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc index ae6f988..e82e3b2 100644 --- a/chrome/browser/history/history_browsertest.cc +++ b/chrome/browser/history/history_browsertest.cc @@ -26,7 +26,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_browser_thread.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" using content::BrowserThread; @@ -67,10 +67,9 @@ class WaitForHistoryTask : public history::HistoryDBTask { class HistoryBrowserTest : public InProcessBrowserTest { protected: - HistoryBrowserTest() - : test_server_(net::SpawnedTestServer::TYPE_HTTP, - net::SpawnedTestServer::kLocalhost, - base::FilePath(kDocRoot)) {} + HistoryBrowserTest() : test_server_() { + test_server_.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot)); + } void SetUp() override { ASSERT_TRUE(test_server_.Start()); @@ -120,11 +119,11 @@ class HistoryBrowserTest : public InProcessBrowserTest { } void LoadAndWaitForFile(const char* filename) { - GURL url = test_server_.GetURL(std::string("History") + filename); + GURL url = test_server_.GetURL(std::string("/History") + filename); LoadAndWaitForURL(url); } - net::SpawnedTestServer test_server_; + net::EmbeddedTestServer test_server_; }; // Test that the browser history is saved (default setting). diff --git a/chrome/browser/history/redirect_browsertest.cc b/chrome/browser/history/redirect_browsertest.cc index f51c18f..56fb331 100644 --- a/chrome/browser/history/redirect_browsertest.cc +++ b/chrome/browser/history/redirect_browsertest.cc @@ -33,7 +33,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "net/base/filename_util.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "ui/events/event_constants.h" class RedirectTest : public InProcessBrowserTest { @@ -73,10 +73,10 @@ class RedirectTest : public InProcessBrowserTest { // Tests a single server redirect IN_PROC_BROWSER_TEST_F(RedirectTest, Server) { - ASSERT_TRUE(test_server()->Start()); - GURL final_url = test_server()->GetURL(std::string()); - GURL first_url = test_server()->GetURL( - "server-redirect?" + final_url.spec()); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL final_url = embedded_test_server()->GetURL("/defaultresponse"); + GURL first_url = + embedded_test_server()->GetURL("/server-redirect?" + final_url.spec()); ui_test_utils::NavigateToURL(browser(), first_url); @@ -88,11 +88,11 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, Server) { // Tests a single client redirect. IN_PROC_BROWSER_TEST_F(RedirectTest, Client) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); - GURL final_url = test_server()->GetURL(std::string()); - GURL first_url = test_server()->GetURL( - "client-redirect?" + final_url.spec()); + GURL final_url = embedded_test_server()->GetURL("/defaultresponse"); + GURL first_url = + embedded_test_server()->GetURL("/client-redirect?" + final_url.spec()); // The client redirect appears as two page visits in the browser. ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( @@ -118,11 +118,11 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, Client) { // http://code.google.com/p/chromium/issues/detail?id=62772 IN_PROC_BROWSER_TEST_F(RedirectTest, ClientEmptyReferer) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Create the file contents, which will do a redirect to the // test server. - GURL final_url = test_server()->GetURL(std::string()); + GURL final_url = embedded_test_server()->GetURL("/defaultresponse"); ASSERT_TRUE(final_url.is_valid()); std::string file_redirect_contents = base::StringPrintf( "<html>" @@ -184,15 +184,15 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, ClientCancelled) { // Tests a client->server->server redirect IN_PROC_BROWSER_TEST_F(RedirectTest, ClientServerServer) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); - GURL final_url = test_server()->GetURL(std::string()); - GURL next_to_last = test_server()->GetURL( - "server-redirect?" + final_url.spec()); - GURL second_url = test_server()->GetURL( - "server-redirect?" + next_to_last.spec()); - GURL first_url = test_server()->GetURL( - "client-redirect?" + second_url.spec()); + GURL final_url = embedded_test_server()->GetURL("/defaultresponse"); + GURL next_to_last = + embedded_test_server()->GetURL("/server-redirect?" + final_url.spec()); + GURL second_url = + embedded_test_server()->GetURL("/server-redirect?" + next_to_last.spec()); + GURL first_url = + embedded_test_server()->GetURL("/client-redirect?" + second_url.spec()); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( browser(), first_url, 2); @@ -206,13 +206,13 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, ClientServerServer) { // Tests that the "#reference" gets preserved across server redirects. IN_PROC_BROWSER_TEST_F(RedirectTest, ServerReference) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); const std::string ref("reference"); - GURL final_url = test_server()->GetURL(std::string()); - GURL initial_url = test_server()->GetURL( - "server-redirect?" + final_url.spec() + "#" + ref); + GURL final_url = embedded_test_server()->GetURL("/defaultresponse"); + GURL initial_url = embedded_test_server()->GetURL( + "/server-redirect?" + final_url.spec() + "#" + ref); ui_test_utils::NavigateToURL(browser(), initial_url); @@ -227,12 +227,12 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, ServerReference) { // // Flaky on XP and Vista, http://crbug.com/69390. IN_PROC_BROWSER_TEST_F(RedirectTest, NoHttpToFile) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL file_url = ui_test_utils::GetTestUrl( base::FilePath(), base::FilePath().AppendASCII("http_to_file.html")); - GURL initial_url = test_server()->GetURL( - "client-redirect?" + file_url.spec()); + GURL initial_url = + embedded_test_server()->GetURL("/client-redirect?" + file_url.spec()); ui_test_utils::NavigateToURL(browser(), initial_url); // We make sure the title doesn't match the title from the file, because the @@ -244,7 +244,7 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, NoHttpToFile) { // Ensures that non-user initiated location changes (within page) are // flagged as client redirects. See bug 1139823. IN_PROC_BROWSER_TEST_F(RedirectTest, ClientFragments) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL first_url = ui_test_utils::GetTestUrl( base::FilePath(), base::FilePath().AppendASCII("ref_redirect.html")); ui_test_utils::NavigateToURL(browser(), first_url); @@ -255,7 +255,7 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, ClientFragments) { // TODO(timsteele): This is disabled because our current testserver can't // handle multiple requests in parallel, making it hang on the first request -// to /slow?60. It's unable to serve our second request for files/title2.html +// to /slow?60. It's unable to serve our second request for /title2.html // until /slow? completes, which doesn't give the desired behavior. We could // alternatively load the second page from disk, but we would need to start // the browser for this testcase with --process-per-tab, and I don't think @@ -269,12 +269,12 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, // which causes it to start a provisional load, and while it is waiting // for the response (which means it hasn't committed the load for the client // redirect destination page yet), we issue a new navigation request. - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); - GURL final_url = test_server()->GetURL("files/title2.html"); - GURL slow = test_server()->GetURL("slow?60"); - GURL first_url = test_server()->GetURL( - "client-redirect?" + slow.spec()); + GURL final_url = embedded_test_server()->GetURL("/title2.html"); + GURL slow = embedded_test_server()->GetURL("/slow?60"); + GURL first_url = + embedded_test_server()->GetURL("/client-redirect?" + slow.spec()); content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); @@ -297,7 +297,7 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, bool final_navigation_not_redirect = true; std::vector<GURL> redirects = GetRedirects(first_url); - // Check to make sure our request for files/title2.html doesn't get flagged + // Check to make sure our request for /title2.html doesn't get flagged // as a client redirect from the first (/client-redirect?) page. for (std::vector<GURL>::iterator it = redirects.begin(); it != redirects.end(); ++it) { diff --git a/chrome/browser/infobars/infobars_browsertest.cc b/chrome/browser/infobars/infobars_browsertest.cc index c60acb8..12fd7b5c 100644 --- a/chrome/browser/infobars/infobars_browsertest.cc +++ b/chrome/browser/infobars/infobars_browsertest.cc @@ -60,7 +60,7 @@ IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) { return; #endif - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURL( browser(), embedded_test_server()->GetURL("/simple.html")); diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc index 270b10d..52515c0 100644 --- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc +++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc @@ -247,7 +247,7 @@ class BrowserCloseManagerBrowserTest }; IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestSingleTabShutdown) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( browser(), embedded_test_server()->GetURL("/beforeunload.html"))); RepeatedNotificationObserver cancel_observer( @@ -269,7 +269,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestSingleTabShutdown) { IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestShutdownMoreThanOnce) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( browser(), embedded_test_server()->GetURL("/beforeunload.html"))); RepeatedNotificationObserver cancel_observer( @@ -299,7 +299,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, #endif IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, MAYBE_PRE_TestSessionRestore) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( browser(), embedded_test_server()->GetURL("/beforeunload.html"))); AddBlankTabAndShow(browser()); @@ -353,7 +353,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, // Test that browser windows are only closed if all browsers are ready to close // and that all beforeunload dialogs are shown again after a cancel. IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestMultipleWindows) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); browsers_.push_back(CreateBrowser(browser()->profile())); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( browsers_[0], embedded_test_server()->GetURL("/beforeunload.html"))); @@ -410,7 +410,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestMultipleWindows) { #endif IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, MAYBE_TestHangInBeforeUnloadMultipleTabs) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( browsers_[0], embedded_test_server()->GetURL("/beforeunload_hang.html"))); AddBlankTabAndShow(browsers_[0]); @@ -443,7 +443,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, // early. IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestHangInBeforeUnloadMultipleWindows) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); browsers_.push_back(CreateBrowser(browser()->profile())); browsers_.push_back(CreateBrowser(browser()->profile())); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( @@ -476,7 +476,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, // Test that a window created during shutdown is closed. IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestAddWindowDuringShutdown) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( browsers_[0], embedded_test_server()->GetURL("/beforeunload.html"))); @@ -494,7 +494,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, // cancel the shutdown. IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestAddWindowWithBeforeUnloadDuringShutdown) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( browsers_[0], embedded_test_server()->GetURL("/beforeunload.html"))); @@ -526,7 +526,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, // Disabled for being flaky tests: crbug.com/519646 IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, DISABLED_TestAddTabDuringShutdown) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); browsers_.push_back(CreateBrowser(browser()->profile())); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( browsers_[0], embedded_test_server()->GetURL("/beforeunload.html"))); @@ -550,7 +550,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, // Disabled for being flaky tests: crbug.com/519646 IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, DISABLED_TestAddTabWithBeforeUnloadDuringShutdown) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); browsers_.push_back(CreateBrowser(browser()->profile())); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( browsers_[0], embedded_test_server()->GetURL("/beforeunload.html"))); @@ -588,7 +588,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestCloseTabDuringShutdown) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( browsers_[0], embedded_test_server()->GetURL("/beforeunload.html"))); RepeatedNotificationObserver cancel_observer( @@ -628,7 +628,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, #endif IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, MAYBE_TestOpenAndCloseWindowDuringShutdown) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( browsers_[0], embedded_test_server()->GetURL("/beforeunload.html"))); RepeatedNotificationObserver cancel_observer( @@ -660,7 +660,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestCloseWindowDuringShutdown) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( browsers_[0], embedded_test_server()->GetURL("/beforeunload.html"))); browsers_.push_back(CreateBrowser(browser()->profile())); @@ -730,7 +730,7 @@ class BrowserCloseManagerWithDownloadsBrowserTest : #if defined(OS_MACOSX) IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest, TestWithDownloads) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); SetDownloadPathForProfile(browser()->profile()); ASSERT_NO_FATAL_FAILURE(CreateStalledDownload(browser())); @@ -753,7 +753,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest, // Test shutdown with a DANGEROUS_URL download undecided. IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest, TestWithDangerousUrlDownload) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); SetDownloadPathForProfile(browser()->profile()); // Set up the fake delegate that forces the download to be malicious. @@ -797,7 +797,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest, // Test shutdown with a download in progress. IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest, TestWithDownloads) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); SetDownloadPathForProfile(browser()->profile()); ASSERT_NO_FATAL_FAILURE(CreateStalledDownload(browser())); content::TestNavigationObserver navigation_observer( @@ -826,7 +826,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest, // Test shutdown with a download in progress in an off-the-record profile. IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest, TestWithOffTheRecordDownloads) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); Profile* otr_profile = browser()->profile()->GetOffTheRecordProfile(); SetDownloadPathForProfile(otr_profile); Browser* otr_browser = CreateBrowser(otr_profile); @@ -871,7 +871,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest, profile_manager->RegisterTestingProfile(other_profile, true, false); Browser* other_profile_browser = CreateBrowser(other_profile); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); SetDownloadPathForProfile(browser()->profile()); SetDownloadPathForProfile(other_profile); ASSERT_NO_FATAL_FAILURE(CreateStalledDownload(browser())); @@ -914,7 +914,7 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest, // Disabled, see http://crbug.com/315754. IN_PROC_BROWSER_TEST_P(BrowserCloseManagerWithDownloadsBrowserTest, DISABLED_TestBeforeUnloadAndDownloads) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); SetDownloadPathForProfile(browser()->profile()); ASSERT_NO_FATAL_FAILURE(CreateStalledDownload(browser())); ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL( diff --git a/chrome/browser/loadtimes_extension_bindings_browsertest.cc b/chrome/browser/loadtimes_extension_bindings_browsertest.cc index 24ab846..1c55256 100644 --- a/chrome/browser/loadtimes_extension_bindings_browsertest.cc +++ b/chrome/browser/loadtimes_extension_bindings_browsertest.cc @@ -45,7 +45,7 @@ class LoadtimesExtensionBindingsTest : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest, LoadTimesSameAfterClientInDocNavigation) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL plain_url = embedded_test_server()->GetURL("/simple.html"); ui_test_utils::NavigateToURL(browser(), plain_url); content::WebContents* contents = @@ -61,7 +61,7 @@ IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest, IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest, LoadTimesSameAfterUserInDocNavigation) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL plain_url = embedded_test_server()->GetURL("/simple.html"); GURL hash_url(plain_url.spec() + "#"); ui_test_utils::NavigateToURL(browser(), plain_url); diff --git a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc index cd785b4..05f8033 100644 --- a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc +++ b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc @@ -28,7 +28,7 @@ #include "content/public/test/browser_test_utils.h" #include "media/base/media_switches.h" #include "net/dns/mock_host_resolver.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" // MediaStreamPermissionTest --------------------------------------------------- @@ -56,14 +56,13 @@ class MediaStreamPermissionTest : public WebRtcTestBase { // Returns the URL of the main test page. GURL test_page_url() const { - const char kMainWebrtcTestHtmlPage[] = - "files/webrtc/webrtc_jsep01_test.html"; - return test_server()->GetURL(kMainWebrtcTestHtmlPage); + const char kMainWebrtcTestHtmlPage[] = "/webrtc/webrtc_jsep01_test.html"; + return embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage); } private: content::WebContents* LoadTestPageInBrowser(Browser* browser) { - EXPECT_TRUE(test_server()->Start()); + EXPECT_TRUE(embedded_test_server()->Start()); // Uses the default server. GURL url = test_page_url(); diff --git a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc index 749fe3f..286fa44 100644 --- a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc @@ -622,7 +622,7 @@ void MAYBE_WebRtcAudioQualityBrowserTest::SetupAndRecordAudioCall( const base::FilePath& recording, const std::string& constraints, const base::TimeDelta recording_time) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(test::HasReferenceFilesInCheckout()); ASSERT_TRUE(ForceMicrophoneVolumeTo100Percent()); @@ -685,7 +685,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest, return; } ASSERT_TRUE(test::HasReferenceFilesInCheckout()); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(ForceMicrophoneVolumeTo100Percent()); diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc index ccd1de7..035d337 100644 --- a/chrome/browser/media/chrome_webrtc_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_browsertest.cc @@ -45,7 +45,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, RunsAudioVideoWebRTCCallInTwoTabs) { if (OnWinXp()) return; - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::WebContents* left_tab = OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); @@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, TestWebAudioMediaStream) { // integration. if (OnWinXp()) return; - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); ui_test_utils::NavigateToURL(browser(), url); content::WebContents* tab = diff --git a/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc b/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc index eb22e9a..1f514ee 100644 --- a/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc @@ -52,7 +52,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcDisableEncryptionFlagBrowserTest, if (!OnWinXp()) return; // Flaky timeout on a webrtc Win XP bot. http://crbug.com/368163. - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::WebContents* left_tab = OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage); diff --git a/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc b/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc index 8753b37..be8d639 100644 --- a/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc @@ -184,7 +184,7 @@ INSTANTIATE_TEST_CASE_P(WebRtcGetMediaDevicesBrowserTests, // MediaDevices.enumerateDevices. http://crbug.com/388648. IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest, DISABLED_GetMediaDevicesWithoutAccess) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage)); ui_test_utils::NavigateToURL(browser(), url); content::WebContents* tab = @@ -205,7 +205,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest, // Disabled, fails due to http://crbug.com/382391. IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest, DISABLED_GetMediaDevicesWithAccess) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage)); ui_test_utils::NavigateToURL(browser(), url); content::WebContents* tab = @@ -227,7 +227,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest, // MediaDevices.enumerateDevices. http://crbug.com/388648. IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest, DISABLED_GetMediaDevicesEqualsGetSourcesWithoutAccess) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage)); ui_test_utils::NavigateToURL(browser(), url); content::WebContents* tab = @@ -262,7 +262,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest, // Disabled, fails due to http://crbug.com/382391. IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest, DISABLED_GetMediaDevicesEqualsGetSourcesWithAccess) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage)); ui_test_utils::NavigateToURL(browser(), url); content::WebContents* tab = diff --git a/chrome/browser/media/chrome_webrtc_perf_browsertest.cc b/chrome/browser/media/chrome_webrtc_perf_browsertest.cc index 8d17b53..0e02d08 100644 --- a/chrome/browser/media/chrome_webrtc_perf_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_perf_browsertest.cc @@ -109,7 +109,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcPerfBrowserTest, if (OnWinXp()) return; ASSERT_TRUE(test::HasReferenceFilesInCheckout()); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_GE(TestTimeouts::action_max_timeout().InSeconds(), 100) << "This is a long-running test; you must specify " @@ -154,7 +154,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcPerfBrowserTest, if (OnWinXp()) return; ASSERT_TRUE(test::HasReferenceFilesInCheckout()); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_GE(TestTimeouts::action_max_timeout().InSeconds(), 100) << "This is a long-running test; you must specify " diff --git a/chrome/browser/media/chrome_webrtc_simulcast_browsertest.cc b/chrome/browser/media/chrome_webrtc_simulcast_browsertest.cc index 18931f8..fea1b25 100644 --- a/chrome/browser/media/chrome_webrtc_simulcast_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_simulcast_browsertest.cc @@ -51,7 +51,7 @@ class WebRtcSimulcastBrowserTest : public WebRtcTestBase { #endif IN_PROC_BROWSER_TEST_F(WebRtcSimulcastBrowserTest, MAYBE_TestVgaReturnsTwoSimulcastStreams) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURL( browser(), embedded_test_server()->GetURL(kSimulcastTestPage)); diff --git a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc index 38b64de..d8ac11e 100644 --- a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc @@ -306,7 +306,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, "This is a long-running test; you must specify " "--ui-test-action-max-timeout to have a value of at least 150000."; ASSERT_TRUE(test::HasReferenceFilesInCheckout()); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::WebContents* left_tab = OpenPageAndGetUserMediaInNewTabWithConstraints( diff --git a/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc b/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc index a684c14..fc36cf8 100644 --- a/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc @@ -82,7 +82,7 @@ class WebRtcWebcamBrowserTest : public WebRtcTestBase, // which webcam or drivers you have on the system. IN_PROC_BROWSER_TEST_P(WebRtcWebcamBrowserTest, MANUAL_TestAcquiringAndReacquiringWebcam) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage)); ui_test_utils::NavigateToURL(browser(), url); content::WebContents* tab = diff --git a/chrome/browser/media/encrypted_media_supported_types_browsertest.cc b/chrome/browser/media/encrypted_media_supported_types_browsertest.cc index 14bb9a6..9a577d1 100644 --- a/chrome/browser/media/encrypted_media_supported_types_browsertest.cc +++ b/chrome/browser/media/encrypted_media_supported_types_browsertest.cc @@ -20,7 +20,7 @@ #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "media/base/test_data_util.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. @@ -163,13 +163,11 @@ class EncryptedMediaSupportedTypesTest : public InProcessBrowserTest { // Load the test page needed so that checkKeySystemWithMediaMimeType() // is available. - scoped_ptr<net::SpawnedTestServer> http_test_server( - new net::SpawnedTestServer(net::SpawnedTestServer::TYPE_HTTP, - net::SpawnedTestServer::kLocalhost, - media::GetTestDataPath())); + scoped_ptr<net::EmbeddedTestServer> http_test_server( + new net::EmbeddedTestServer); + http_test_server->ServeFilesFromSourceDirectory(media::GetTestDataPath()); CHECK(http_test_server->Start()); - GURL gurl = - http_test_server->GetURL("files/test_key_system_instantiation.html"); + GURL gurl = http_test_server->GetURL("/test_key_system_instantiation.html"); ui_test_utils::NavigateToURL(browser(), gurl); } diff --git a/chrome/browser/media/media_browsertest.cc b/chrome/browser/media/media_browsertest.cc index 53056ad..6aa919e 100644 --- a/chrome/browser/media/media_browsertest.cc +++ b/chrome/browser/media/media_browsertest.cc @@ -15,7 +15,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "media/base/test_data_util.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" // Common test results. const char MediaBrowserTest::kEnded[] = "ENDED"; @@ -34,16 +34,14 @@ void MediaBrowserTest::RunMediaTestPage(const std::string& html_page, bool http) { GURL gurl; std::string query = media::GetURLQueryString(query_params); - scoped_ptr<net::SpawnedTestServer> http_test_server; + scoped_ptr<net::EmbeddedTestServer> http_test_server; if (http) { DVLOG(0) << base::TimeFormatTimeOfDayWithMilliseconds(base::Time::Now()) << " Starting HTTP server"; - http_test_server.reset( - new net::SpawnedTestServer(net::SpawnedTestServer::TYPE_HTTP, - net::SpawnedTestServer::kLocalhost, - media::GetTestDataPath())); + http_test_server.reset(new net::EmbeddedTestServer); + http_test_server->ServeFilesFromSourceDirectory(media::GetTestDataPath()); CHECK(http_test_server->Start()); - gurl = http_test_server->GetURL("files/" + html_page + "?" + query); + gurl = http_test_server->GetURL("/" + html_page + "?" + query); } else { gurl = content::GetFileUrlWithQuery(media::GetTestDataFilePath(html_page), query); @@ -84,4 +82,3 @@ void MediaBrowserTest::PluginCrashed(const base::FilePath& plugin_path, void MediaBrowserTest::IgnorePluginCrash() { ignore_plugin_crash_ = true; } - diff --git a/chrome/browser/media/media_browsertest.h b/chrome/browser/media/media_browsertest.h index 5d3f222..1ad9c6c 100644 --- a/chrome/browser/media/media_browsertest.h +++ b/chrome/browser/media/media_browsertest.h @@ -16,8 +16,8 @@ class TitleWatcher; } // Class used to automate running media related browser tests. The functions -// assume that media files are located under files/media/ folder known to -// the test http server. +// assume that media files are located under media/ folder known to the test +// http server. class MediaBrowserTest : public InProcessBrowserTest, public content::WebContentsObserver { protected: diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc index a0eabf4..eccbfad 100644 --- a/chrome/browser/notifications/notification_browsertest.cc +++ b/chrome/browser/notifications/notification_browsertest.cc @@ -392,7 +392,7 @@ void NotificationsTest::DropOriginPreference(const GURL& origin) { // Flaky on Windows, Mac, Linux: http://crbug.com/437414. IN_PROC_BROWSER_TEST_F(NotificationsTest, DISABLED_TestUserGestureInfobar) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURL( browser(), @@ -413,7 +413,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, DISABLED_TestUserGestureInfobar) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCreateSimpleNotification) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Creates a simple notification. AllowAllOrigins(); @@ -451,7 +451,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, NotificationBlockerTest) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCloseNotification) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Creates a notification and closes it. AllowAllOrigins(); @@ -471,7 +471,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCloseNotification) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCancelNotification) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Creates a notification and cancels it in the origin page. AllowAllOrigins(); @@ -487,7 +487,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCancelNotification) { // Requests notification privileges and verifies the prompt appears. IN_PROC_BROWSER_TEST_F(NotificationsTest, TestPermissionRequestUIAppears) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURL(browser(), GetTestPageURL()); EXPECT_TRUE(RequestPermissionAndWait(browser())); @@ -495,7 +495,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestPermissionRequestUIAppears) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestAllowOnPermissionRequestUI) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Tries to create a notification & clicks 'allow' on the prompt. ui_test_utils::NavigateToURL(browser(), GetTestPageURL()); @@ -510,7 +510,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestAllowOnPermissionRequestUI) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestDenyOnPermissionRequestUI) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Test that no notification is created when Deny is chosen from prompt. ui_test_utils::NavigateToURL(browser(), GetTestPageURL()); @@ -523,7 +523,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestDenyOnPermissionRequestUI) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestClosePermissionRequestUI) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Test that no notification is created when prompt is dismissed. ui_test_utils::NavigateToURL(browser(), GetTestPageURL()); @@ -536,7 +536,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestClosePermissionRequestUI) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestAllowNotificationsFromAllSites) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Verify that all domains can be allowed to show notifications. SetDefaultContentSetting(CONTENT_SETTING_ALLOW); @@ -549,7 +549,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestAllowNotificationsFromAllSites) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestDenyNotificationsFromAllSites) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Verify that no domain can show notifications. SetDefaultContentSetting(CONTENT_SETTING_BLOCK); @@ -562,7 +562,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestDenyNotificationsFromAllSites) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestDenyDomainAndAllowAll) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Verify that denying a domain and allowing all shouldn't show // notifications from the denied domain. @@ -578,7 +578,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestDenyDomainAndAllowAll) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestAllowDomainAndDenyAll) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Verify that allowing a domain and denying all others should show // notifications from the allowed domain. @@ -594,7 +594,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestAllowDomainAndDenyAll) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestDenyAndThenAllowDomain) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Verify that denying and again allowing should show notifications. DenyOrigin(GetTestPageURL().GetOrigin()); @@ -614,7 +614,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestDenyAndThenAllowDomain) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCreateDenyCloseNotifications) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Verify able to create, deny, and close the notification. AllowAllOrigins(); @@ -640,7 +640,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCreateDenyCloseNotifications) { IN_PROC_BROWSER_TEST_F( NotificationsTest, DISABLED_TestOriginPrefsNotSavedInIncognito) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Verify that allow/deny origin preferences are not saved in incognito. Browser* incognito = CreateIncognitoBrowser(); @@ -667,7 +667,7 @@ IN_PROC_BROWSER_TEST_F( } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestIncognitoNotification) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Test notifications in incognito window. Browser* browser = CreateIncognitoBrowser(); @@ -679,7 +679,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestIncognitoNotification) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCloseTabWithPermissionRequestUI) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Test that user can close tab when bubble present. ui_test_utils::NavigateToURL(browser(), GetTestPageURL()); @@ -702,7 +702,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCloseTabWithPermissionRequestUI) { IN_PROC_BROWSER_TEST_F(NotificationsTest, MAYBE_TestCrashRendererNotificationRemain) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Test crashing renderer does not close or crash notification. AllowAllOrigins(); @@ -720,7 +720,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNotificationReplacement) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Test that we can replace a notification using the replaceId. AllowAllOrigins(); @@ -746,7 +746,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNotificationReplacement) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestLastUsage) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); HostContentSettingsMap* settings_map = HostContentSettingsMapFactory::GetForProfile(browser()->profile()); @@ -781,7 +781,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestLastUsage) { IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNotificationReplacementReappearance) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Test that we can replace a notification using the tag, and that it will // cause the notification to reappear as a popup again. @@ -816,7 +816,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNotificationValidIcon) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); AllowAllOrigins(); ui_test_utils::NavigateToURL(browser(), GetTestPageURL()); @@ -837,7 +837,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNotificationValidIcon) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNotificationInvalidIcon) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); AllowAllOrigins(); ui_test_utils::NavigateToURL(browser(), GetTestPageURL()); @@ -868,7 +868,7 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNotificationInvalidIcon) { } IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNotificationDoubleClose) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); AllowAllOrigins(); ui_test_utils::NavigateToURL( diff --git a/chrome/browser/notifications/platform_notification_service_browsertest.cc b/chrome/browser/notifications/platform_notification_service_browsertest.cc index 70b27a2..af386a8 100644 --- a/chrome/browser/notifications/platform_notification_service_browsertest.cc +++ b/chrome/browser/notifications/platform_notification_service_browsertest.cc @@ -24,7 +24,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test_utils.h" #include "net/base/filename_util.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gmock/include/gmock/gmock.h" #include "ui/base/l10n/l10n_util.h" @@ -85,7 +85,7 @@ class PlatformNotificationServiceBrowserTest : public InProcessBrowserTest { const base::FilePath server_root_; const std::string test_page_url_; scoped_ptr<StubNotificationUIManager> ui_manager_; - scoped_ptr<net::SpawnedTestServer> https_server_; + scoped_ptr<net::EmbeddedTestServer> https_server_; }; // ----------------------------------------------------------------------------- @@ -98,15 +98,13 @@ PlatformNotificationServiceBrowserTest::PlatformNotificationServiceBrowserTest() : server_root_(FILE_PATH_LITERAL("chrome/test/data")), // The test server has a base directory that doesn't exist in the // filesystem. - test_page_url_(std::string("files/") + kTestFileName) { -} + test_page_url_(std::string("/") + kTestFileName) {} void PlatformNotificationServiceBrowserTest::SetUp() { ui_manager_.reset(new StubNotificationUIManager); - https_server_.reset(new net::SpawnedTestServer( - net::SpawnedTestServer::TYPE_HTTPS, - net::BaseTestServer::SSLOptions(net::BaseTestServer::SSLOptions::CERT_OK), - server_root_)); + https_server_.reset( + new net::EmbeddedTestServer(net::EmbeddedTestServer::TYPE_HTTPS)); + https_server_->ServeFilesFromSourceDirectory(server_root_); ASSERT_TRUE(https_server_->Start()); service()->SetNotificationUIManagerForTesting(ui_manager_.get()); diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc index 74cbd6b..014f852 100644 --- a/chrome/browser/password_manager/password_manager_browsertest.cc +++ b/chrome/browser/password_manager/password_manager_browsertest.cc @@ -54,7 +54,6 @@ #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" -#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/test_url_fetcher_factory.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/WebKit/public/web/WebInputEvent.h" @@ -1384,18 +1383,16 @@ IN_PROC_BROWSER_TEST_F( ::switches::kIgnoreCertificateErrors); const base::FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); - net::SpawnedTestServer https_test_server( - net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::SSLOptions( - net::SpawnedTestServer::SSLOptions::CERT_OK), - base::FilePath(kDocRoot)); + net::EmbeddedTestServer https_test_server( + net::EmbeddedTestServer::TYPE_HTTPS); + https_test_server.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot)); ASSERT_TRUE(https_test_server.Start()); // This test case cannot inject the scripts via content::ExecuteScript() in // files served through HTTPS. Therefore the scripts are made part of the HTML // site and executed on load. std::string path = - "password/separate_login_form_with_onload_submit_script.html"; + "/password/separate_login_form_with_onload_submit_script.html"; GURL https_url(https_test_server.GetURL(path)); ASSERT_TRUE(https_url.SchemeIs(url::kHttpsScheme)); diff --git a/chrome/browser/password_manager/password_manager_test_base.cc b/chrome/browser/password_manager/password_manager_test_base.cc index 0a875de..18750a3 100644 --- a/chrome/browser/password_manager/password_manager_test_base.cc +++ b/chrome/browser/password_manager/password_manager_test_base.cc @@ -193,7 +193,7 @@ void PasswordManagerBrowserTestBase::SetUpOnMainThread() { browser()->profile(), password_manager::BuildPasswordStore< content::BrowserContext, password_manager::TestPasswordStore>); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_FALSE(base::CommandLine::ForCurrentProcess()->HasSwitch( password_manager::switches::kEnableAutomaticPasswordSaving)); } diff --git a/chrome/browser/pdf/pdf_extension_test.cc b/chrome/browser/pdf/pdf_extension_test.cc index 5477b50..44cc7bd 100644 --- a/chrome/browser/pdf/pdf_extension_test.cc +++ b/chrome/browser/pdf/pdf_extension_test.cc @@ -73,7 +73,7 @@ class PDFExtensionTest : public ExtensionApiTest, void SetUpOnMainThread() override { ExtensionApiTest::SetUpOnMainThread(); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); } void TearDownOnMainThread() override { diff --git a/chrome/browser/plugins/plugin_power_saver_browsertest.cc b/chrome/browser/plugins/plugin_power_saver_browsertest.cc index 374a337..d48cf72 100644 --- a/chrome/browser/plugins/plugin_power_saver_browsertest.cc +++ b/chrome/browser/plugins/plugin_power_saver_browsertest.cc @@ -261,7 +261,7 @@ class PluginPowerSaverBrowserTest : public InProcessBrowserTest { void SetUpOnMainThread() override { InProcessBrowserTest::SetUpOnMainThread(); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); embedded_test_server()->ServeFilesFromDirectory( ui_test_utils::GetTestFilePath( diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index b5220e0..e28497c 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -161,7 +161,7 @@ #include "net/http/http_stream_factory.h" #include "net/ssl/ssl_config.h" #include "net/ssl/ssl_config_service.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/url_request/url_request_failed_job.h" #include "net/test/url_request/url_request_mock_http_job.h" #include "net/url_request/url_request.h" @@ -3703,11 +3703,10 @@ INSTANTIATE_TEST_CASE_P(MediaStreamDevicesControllerBrowserTestInstance, // Test that when extended reporting opt-in is disabled by policy, the // opt-in checkbox does not appear on SSL blocking pages. IN_PROC_BROWSER_TEST_F(PolicyTest, SafeBrowsingExtendedReportingOptInAllowed) { - net::SpawnedTestServer https_server_expired( - net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::SSLOptions( - net::SpawnedTestServer::SSLOptions::CERT_EXPIRED), - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server_expired( + net::EmbeddedTestServer::TYPE_HTTPS); + https_server_expired.SetSSLConfig(net::EmbeddedTestServer::CERT_EXPIRED); + https_server_expired.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server_expired.Start()); // Set the enterprise policy to disallow opt-in. @@ -3756,11 +3755,10 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SafeBrowsingExtendedReportingOptInAllowed) { // Test that when SSL error overriding is allowed by policy (default), the // proceed link appears on SSL blocking pages. IN_PROC_BROWSER_TEST_F(PolicyTest, SSLErrorOverridingAllowed) { - net::SpawnedTestServer https_server_expired( - net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::SSLOptions( - net::SpawnedTestServer::SSLOptions::CERT_EXPIRED), - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server_expired( + net::EmbeddedTestServer::TYPE_HTTPS); + https_server_expired.SetSSLConfig(net::EmbeddedTestServer::CERT_EXPIRED); + https_server_expired.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server_expired.Start()); const PrefService* const prefs = browser()->profile()->GetPrefs(); @@ -3787,11 +3785,10 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SSLErrorOverridingAllowed) { // proceed link does not appear on SSL blocking pages and users should not // be able to proceed. IN_PROC_BROWSER_TEST_F(PolicyTest, SSLErrorOverridingDisallowed) { - net::SpawnedTestServer https_server_expired( - net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::SSLOptions( - net::SpawnedTestServer::SSLOptions::CERT_EXPIRED), - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server_expired( + net::EmbeddedTestServer::TYPE_HTTPS); + https_server_expired.SetSSLConfig(net::EmbeddedTestServer::CERT_EXPIRED); + https_server_expired.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server_expired.Start()); const PrefService* const prefs = browser()->profile()->GetPrefs(); diff --git a/chrome/browser/policy/test/local_policy_test_server.cc b/chrome/browser/policy/test/local_policy_test_server.cc index 439067f..9909478 100644 --- a/chrome/browser/policy/test/local_policy_test_server.cc +++ b/chrome/browser/policy/test/local_policy_test_server.cc @@ -18,7 +18,6 @@ #include "components/policy/core/common/cloud/cloud_policy_constants.h" #include "crypto/rsa_private_key.h" #include "net/test/python_utils.h" -#include "net/test/spawned_test_server/base_test_server.h" namespace policy { diff --git a/chrome/browser/prefetch/prefetch_browsertest.cc b/chrome/browser/prefetch/prefetch_browsertest.cc index 91b6aaf..2119c83 100644 --- a/chrome/browser/prefetch/prefetch_browsertest.cc +++ b/chrome/browser/prefetch/prefetch_browsertest.cc @@ -53,7 +53,7 @@ class PrefetchBrowserTestBase : public InProcessBrowserTest { } void SetUpOnMainThread() override { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); InProcessBrowserTest::SetUpOnMainThread(); } diff --git a/chrome/browser/prefs/pref_functional_browsertest.cc b/chrome/browser/prefs/pref_functional_browsertest.cc index 55b93a9..b449b607 100644 --- a/chrome/browser/prefs/pref_functional_browsertest.cc +++ b/chrome/browser/prefs/pref_functional_browsertest.cc @@ -25,6 +25,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/download_test_observer.h" +#include "net/test/embedded_test_server/embedded_test_server.h" using content::BrowserContext; using content::DownloadManager; @@ -48,7 +49,7 @@ class PrefsFunctionalTest : public InProcessBrowserTest { }; IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestDownloadDirPref) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); base::ScopedTempDir new_download_dir; ASSERT_TRUE(new_download_dir.CreateUniqueTempDir()); @@ -63,8 +64,7 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestDownloadDirPref) { scoped_ptr<content::DownloadTestObserver> downloads_observer( CreateWaiter(browser(), 1)); ui_test_utils::NavigateToURL( - browser(), - test_server()->GetURL("files/downloads/a_zip_file.zip")); + browser(), embedded_test_server()->GetURL("/downloads/a_zip_file.zip")); // Waits for the download to complete. downloads_observer->WaitForFinished(); EXPECT_TRUE(base::PathExists(downloaded_pkg)); @@ -72,11 +72,10 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestDownloadDirPref) { // Verify image content settings show or hide images. IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestImageContentSettings) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURL( - browser(), - test_server()->GetURL("files/settings/image_page.html")); + browser(), embedded_test_server()->GetURL("/settings/image_page.html")); bool result = false; std::string script = @@ -100,8 +99,7 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestImageContentSettings) { CONTENT_SETTING_BLOCK); ui_test_utils::NavigateToURL( - browser(), - test_server()->GetURL("files/settings/image_page.html")); + browser(), embedded_test_server()->GetURL("/settings/image_page.html")); result = false; EXPECT_TRUE(content::ExecuteScriptAndExtractBool( @@ -113,20 +111,18 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestImageContentSettings) { // Verify that enabling/disabling Javascript in prefs works. IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestJavascriptEnableDisable) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); EXPECT_TRUE(browser()->profile()->GetPrefs()->GetBoolean( prefs::kWebKitJavascriptEnabled)); ui_test_utils::NavigateToURL( - browser(), - test_server()->GetURL("files/javaScriptTitle.html")); + browser(), embedded_test_server()->GetURL("/javaScriptTitle.html")); EXPECT_EQ(base::ASCIIToUTF16("Title from script javascript enabled"), browser()->tab_strip_model()->GetActiveWebContents()->GetTitle()); browser()->profile()->GetPrefs()->SetBoolean(prefs::kWebKitJavascriptEnabled, false); ui_test_utils::NavigateToURL( - browser(), - test_server()->GetURL("files/javaScriptTitle.html")); + browser(), embedded_test_server()->GetURL("/javaScriptTitle.html")); EXPECT_EQ(base::ASCIIToUTF16("This is html title"), browser()->tab_strip_model()->GetActiveWebContents()->GetTitle()); } @@ -148,8 +144,8 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, // Verify images are not blocked in incognito mode. IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestImagesNotBlockedInIncognito) { - ASSERT_TRUE(test_server()->Start()); - GURL url = test_server()->GetURL("files/settings/image_page.html"); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL url = embedded_test_server()->GetURL("/settings/image_page.html"); Browser* incognito_browser = CreateIncognitoBrowser(); ui_test_utils::NavigateToURL(incognito_browser, url); @@ -241,4 +237,3 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestPrivacySecurityPrefs) { IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestHaveLocalStatePrefs) { EXPECT_TRUE(g_browser_process->local_state()->GetPreferenceValues().get()); } - diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 37a605b..19fdb15 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -17,6 +17,7 @@ #include "base/run_loop.h" #include "base/scoped_observer.h" #include "base/stl_util.h" +#include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -103,6 +104,9 @@ #include "net/dns/mock_host_resolver.h" #include "net/ssl/client_cert_store.h" #include "net/ssl/ssl_cert_request_info.h" +#include "net/ssl/ssl_server_config.h" +#include "net/test/embedded_test_server/embedded_test_server.h" +#include "net/test/embedded_test_server/request_handler_util.h" #include "net/test/url_request/url_request_mock_http_job.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" @@ -201,12 +205,12 @@ const char* kReadyTitle = "READY"; const char* kPassTitle = "PASS"; std::string CreateClientRedirect(const std::string& dest_url) { - const char* const kClientRedirectBase = "client-redirect?"; + const char* const kClientRedirectBase = "/client-redirect?"; return kClientRedirectBase + net::EscapeQueryParamValue(dest_url, false); } std::string CreateServerRedirect(const std::string& dest_url) { - const char* const kServerRedirectBase = "server-redirect?"; + const char* const kServerRedirectBase = "/server-redirect?"; return kServerRedirectBase + net::EscapeQueryParamValue(dest_url, false); } @@ -1101,8 +1105,9 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { #endif call_javascript_(true), check_load_events_(true), - loader_path_("files/prerender/prerender_loader.html"), - explicitly_set_browser_(NULL) {} + loader_path_("/prerender/prerender_loader.html"), + explicitly_set_browser_(NULL) { + } ~PrerenderBrowserTest() override {} @@ -1140,7 +1145,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { prefs::kPromptForDownload, false); IncreasePrerenderMemory(); if (autostart_test_server_) - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ChromeResourceDispatcherHostDelegate:: SetExternalProtocolHandlerDelegateForTesting( &external_protocol_handler_delegate_); @@ -1164,7 +1169,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { const std::string& html_file, FinalStatus expected_final_status, int expected_number_of_loads) { - GURL url = test_server()->GetURL(html_file); + GURL url = embedded_test_server()->GetURL(html_file); return PrerenderTestURL(url, expected_final_status, expected_number_of_loads); @@ -1174,7 +1179,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { const std::string& html_file, const std::vector<FinalStatus>& expected_final_status_queue, int expected_number_of_loads) { - GURL url = test_server()->GetURL(html_file); + GURL url = embedded_test_server()->GetURL(html_file); return PrerenderTestURLImpl(url, expected_final_status_queue, expected_number_of_loads); @@ -1215,7 +1220,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { void NavigateToURLWithDisposition(const std::string& dest_html_file, WindowOpenDisposition disposition, bool expect_swap_to_succeed) const { - GURL dest_url = test_server()->GetURL(dest_html_file); + GURL dest_url = embedded_test_server()->GetURL(dest_html_file); NavigateToURLWithDisposition(dest_url, disposition, expect_swap_to_succeed); } @@ -1285,7 +1290,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { void NavigateToNextPageAfterPrerender() const { ui_test_utils::NavigateToURL( current_browser(), - test_server()->GetURL("files/prerender/prerender_page.html")); + embedded_test_server()->GetURL("/prerender/prerender_page.html")); } // Called after the prerendered page has been navigated to and then away from. @@ -1321,7 +1326,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { } bool UrlIsInPrerenderManager(const std::string& html_file) const { - return UrlIsInPrerenderManager(test_server()->GetURL(html_file)); + return UrlIsInPrerenderManager(embedded_test_server()->GetURL(html_file)); } bool UrlIsInPrerenderManager(const GURL& url) const { @@ -1333,10 +1338,8 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { if (https_src_server_) return; https_src_server_.reset( - new net::SpawnedTestServer( - net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data")))); + new net::EmbeddedTestServer(net::EmbeddedTestServer::TYPE_HTTPS)); + https_src_server_->ServeFilesFromSourceDirectory("chrome/test/data"); CHECK(https_src_server_->Start()); } @@ -1480,10 +1483,8 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { static const std::string secondary_domain = "www.foo.com"; host_resolver()->AddRule(secondary_domain, "127.0.0.1"); std::string url_str(base::StringPrintf( - "http://%s:%d/%s", - secondary_domain.c_str(), - test_server()->host_port_pair().port(), - path.c_str())); + "http://%s:%d/%s", secondary_domain.c_str(), + embedded_test_server()->host_port_pair().port(), path.c_str())); return GURL(url_str); } @@ -1570,16 +1571,14 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { int expected_number_of_loads) { dest_url_ = prerender_url; - std::vector<net::SpawnedTestServer::StringPair> replacement_text; + base::StringPairs replacement_text; replacement_text.push_back( make_pair("REPLACE_WITH_PRERENDER_URL", prerender_url.spec())); std::string replacement_path; - CHECK(net::SpawnedTestServer::GetFilePathWithReplacements( - loader_path_, - replacement_text, - &replacement_path)); + net::test_server::GetFilePathWithReplacements( + loader_path_, replacement_text, &replacement_path); - const net::SpawnedTestServer* src_server = test_server(); + const net::EmbeddedTestServer* src_server = embedded_test_server(); if (https_src_server_) src_server = https_src_server_.get(); GURL loader_url = src_server->GetURL( @@ -1699,7 +1698,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { #endif NeverRunsExternalProtocolHandlerDelegate external_protocol_handler_delegate_; GURL dest_url_; - scoped_ptr<net::SpawnedTestServer> https_src_server_; + scoped_ptr<net::EmbeddedTestServer> https_src_server_; bool call_javascript_; bool check_load_events_; std::string loader_host_override_; @@ -1713,7 +1712,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { // <link rel=prerender> tag and then loaded into a tab in response to a // navigation. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPage) { - PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1); EXPECT_EQ(1, GetPrerenderDomContentLoadedEventCountForLinkNumber(0)); histogram_tester().ExpectTotalCount("Prerender.none_PerceivedPLT", 1); histogram_tester().ExpectTotalCount("Prerender.none_PerceivedPLTMatched", 0); @@ -1739,7 +1738,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPage) { // Checks that cross-domain prerenders emit the correct histograms. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageCrossDomain) { - PrerenderTestURL(GetCrossDomainTestUrl("files/prerender/prerender_page.html"), + PrerenderTestURL(GetCrossDomainTestUrl("prerender/prerender_page.html"), FINAL_STATUS_USED, 1); histogram_tester().ExpectTotalCount("Prerender.none_PerceivedPLT", 1); histogram_tester().ExpectTotalCount("Prerender.none_PerceivedPLTMatched", 0); @@ -1758,9 +1757,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageCrossDomain) { // Checks that pending prerenders launch and receive proper event treatment. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPagePending) { - scoped_ptr<TestPrerender> prerender = - PrerenderTestURL("files/prerender/prerender_page_pending.html", - FINAL_STATUS_USED, 1); + scoped_ptr<TestPrerender> prerender = PrerenderTestURL( + "/prerender/prerender_page_pending.html", FINAL_STATUS_USED, 1); // Navigate to the prerender. scoped_ptr<TestPrerender> prerender2 = ExpectPrerender(FINAL_STATUS_USED); @@ -1773,7 +1771,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPagePending) { prerender2->WaitForLoads(1); const GURL prerender_page_url = - test_server()->GetURL("files/prerender/prerender_page.html"); + embedded_test_server()->GetURL("/prerender/prerender_page.html"); EXPECT_FALSE(IsEmptyPrerenderLinkManager()); EXPECT_NE(static_cast<TestPrerenderContents*>(NULL), GetPrerenderContentsFor(prerender_page_url)); @@ -1792,7 +1790,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPagePending) { // Checks that pending prerenders which are canceled before they are launched // never get started. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageRemovesPending) { - PrerenderTestURL("files/prerender/prerender_page_removes_pending.html", + PrerenderTestURL("/prerender/prerender_page_removes_pending.html", FINAL_STATUS_USED, 1); ChannelDestructionWatcher channel_close_watcher; @@ -1811,9 +1809,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageRemovesPending) { } IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageRemovingLink) { - scoped_ptr<TestPrerender> prerender = - PrerenderTestURL("files/prerender/prerender_page.html", - FINAL_STATUS_CANCELLED, 1); + scoped_ptr<TestPrerender> prerender = PrerenderTestURL( + "/prerender/prerender_page.html", FINAL_STATUS_CANCELLED, 1); // No ChannelDestructionWatcher is needed here, since prerenders in the // PrerenderLinkManager should be deleted by removing the links, rather than @@ -1836,9 +1833,8 @@ IN_PROC_BROWSER_TEST_F( GetPrerenderManager()->mutable_config().max_link_concurrency_per_launcher = 2; set_loader_query("links_to_insert=2"); - scoped_ptr<TestPrerender> prerender = - PrerenderTestURL("files/prerender/prerender_page.html", - FINAL_STATUS_CANCELLED, 1); + scoped_ptr<TestPrerender> prerender = PrerenderTestURL( + "/prerender/prerender_page.html", FINAL_STATUS_CANCELLED, 1); EXPECT_TRUE(DidReceivePrerenderStartEventForLinkNumber(0)); EXPECT_FALSE(DidReceivePrerenderStopEventForLinkNumber(0)); EXPECT_TRUE(DidReceivePrerenderStartEventForLinkNumber(1)); @@ -1864,7 +1860,7 @@ IN_PROC_BROWSER_TEST_F( GetPrerenderManager()->mutable_config().max_link_concurrency = 2; GetPrerenderManager()->mutable_config().max_link_concurrency_per_launcher = 2; - GURL url = test_server()->GetURL("files/prerender/prerender_page.html"); + GURL url = embedded_test_server()->GetURL("/prerender/prerender_page.html"); scoped_ptr<TestPrerender> prerender = PrerenderTestURL(url, FINAL_STATUS_CANCELLED, 1); @@ -1897,8 +1893,7 @@ IN_PROC_BROWSER_TEST_F( GetPrerenderManager()->mutable_config().max_link_concurrency = 2; GetPrerenderManager()->mutable_config().max_link_concurrency_per_launcher = 2; set_loader_query("links_to_insert=2"); - PrerenderTestURL("files/prerender/prerender_page.html", - FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1); EXPECT_TRUE(DidReceivePrerenderStartEventForLinkNumber(0)); EXPECT_FALSE(DidReceivePrerenderStopEventForLinkNumber(0)); EXPECT_TRUE(DidReceivePrerenderStartEventForLinkNumber(1)); @@ -1926,8 +1921,7 @@ IN_PROC_BROWSER_TEST_F( // Checks that the visibility API works. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderVisibility) { - PrerenderTestURL("files/prerender/prerender_visibility.html", - FINAL_STATUS_USED, + PrerenderTestURL("/prerender/prerender_visibility.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -1979,23 +1973,21 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNoCommitNoSwap2) { // Checks that the prerendering of a page is canceled correctly when a // Javascript alert is called. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAlertBeforeOnload) { - PrerenderTestURL("files/prerender/prerender_alert_before_onload.html", - FINAL_STATUS_JAVASCRIPT_ALERT, - 0); + PrerenderTestURL("/prerender/prerender_alert_before_onload.html", + FINAL_STATUS_JAVASCRIPT_ALERT, 0); } // Checks that the prerendering of a page is canceled correctly when a // Javascript alert is called. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAlertAfterOnload) { - PrerenderTestURL("files/prerender/prerender_alert_after_onload.html", - FINAL_STATUS_JAVASCRIPT_ALERT, - 1); + PrerenderTestURL("/prerender/prerender_alert_after_onload.html", + FINAL_STATUS_JAVASCRIPT_ALERT, 1); } // Checks that plugins are not loaded while a page is being preloaded, but // are loaded when the page is displayed. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDelayLoadPlugin) { - PrerenderTestURL("files/prerender/prerender_plugin_delay_load.html", + PrerenderTestURL("/prerender/prerender_plugin_delay_load.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -2009,7 +2001,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderContentSettingDetect) { content_settings_map->SetDefaultContentSetting( CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_DETECT_IMPORTANT_CONTENT); - PrerenderTestURL("files/prerender/prerender_plugin_power_saver.html", + PrerenderTestURL("/prerender/prerender_plugin_power_saver.html", FINAL_STATUS_USED, 1); DisableJavascriptCalls(); @@ -2029,16 +2021,15 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderContentSettingBlock) { content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK); - PrerenderTestURL("files/prerender/prerender_plugin_never_load.html", + PrerenderTestURL("/prerender/prerender_plugin_never_load.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); } // Checks that we don't load a NaCl plugin when NaCl is disabled. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNaClPluginDisabled) { - PrerenderTestURL("files/prerender/prerender_plugin_nacl_disabled.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_plugin_nacl_disabled.html", + FINAL_STATUS_USED, 1); NavigateToDestURL(); @@ -2071,9 +2062,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNaClPluginDisabled) { #endif IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderIframeDelayLoadPlugin) { - PrerenderTestURL("files/prerender/prerender_iframe_plugin_delay_load.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_iframe_plugin_delay_load.html", + FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -2081,9 +2071,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // iframe with a source that requires http authentication. This should not // prerender successfully. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHttpAuthentication) { - PrerenderTestURL("files/prerender/prerender_http_auth_container.html", - FINAL_STATUS_AUTH_NEEDED, - 0); + PrerenderTestURL("/prerender/prerender_http_auth_container.html", + FINAL_STATUS_AUTH_NEEDED, 0); } // Checks that client-issued redirects work with prerendering. @@ -2091,9 +2080,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHttpAuthentication) { // than the final destination page. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectNavigateToFirst) { - PrerenderTestURL(CreateClientRedirect("files/prerender/prerender_page.html"), - FINAL_STATUS_USED, - 2); + PrerenderTestURL(CreateClientRedirect("/prerender/prerender_page.html"), + FINAL_STATUS_USED, 2); NavigateToDestURL(); } @@ -2102,19 +2090,17 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // page which does the redirection. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectNavigateToSecond) { - PrerenderTestURL(CreateClientRedirect("files/prerender/prerender_page.html"), - FINAL_STATUS_USED, - 2); - NavigateToURL("files/prerender/prerender_page.html"); + PrerenderTestURL(CreateClientRedirect("/prerender/prerender_page.html"), + FINAL_STATUS_USED, 2); + NavigateToURL("/prerender/prerender_page.html"); } // Checks that redirects with location.replace do not cancel a prerender and // and swap when navigating to the first page. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderLocationReplaceNavigateToFirst) { - PrerenderTestURL("files/prerender/prerender_location_replace.html", - FINAL_STATUS_USED, - 2); + PrerenderTestURL("/prerender/prerender_location_replace.html", + FINAL_STATUS_USED, 2); NavigateToDestURL(); } @@ -2122,10 +2108,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // and swap when navigating to the second. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderLocationReplaceNavigateToSecond) { - PrerenderTestURL("files/prerender/prerender_location_replace.html", - FINAL_STATUS_USED, - 2); - NavigateToURL("files/prerender/prerender_page.html"); + PrerenderTestURL("/prerender/prerender_location_replace.html", + FINAL_STATUS_USED, 2); + NavigateToURL("/prerender/prerender_page.html"); } // Checks that we get the right PPLT histograms for client redirect prerenders @@ -2137,15 +2122,14 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // The loader page should look like Google. static const char kGoogleDotCom[] = "www.google.com"; SetLoaderHostOverride(kGoogleDotCom); - set_loader_path("files/prerender/prerender_loader_with_replace_state.html"); + set_loader_path("/prerender/prerender_loader_with_replace_state.html"); - GURL dest_url = GetCrossDomainTestUrl( - "files/prerender/prerender_deferred_image.html"); + GURL dest_url = + GetCrossDomainTestUrl("prerender/prerender_deferred_image.html"); - GURL prerender_url = test_server()->GetURL( - "files/prerender/prerender_location_replace.html?" + - net::EscapeQueryParamValue(dest_url.spec(), false) + - "#prerender"); + GURL prerender_url = embedded_test_server()->GetURL( + "/prerender/prerender_location_replace.html?" + + net::EscapeQueryParamValue(dest_url.spec(), false) + "#prerender"); GURL::Replacements replacements; replacements.SetHostStr(kGoogleDotCom); prerender_url = prerender_url.ReplaceComponents(replacements); @@ -2168,10 +2152,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, histogram_tester().ExpectTotalCount("Prerender.gws_PrerenderNotSwappedInPLT", 0); - GURL navigate_url = test_server()->GetURL( - "files/prerender/prerender_location_replace.html?" + - net::EscapeQueryParamValue(dest_url.spec(), false) + - "#navigate"); + GURL navigate_url = embedded_test_server()->GetURL( + "/prerender/prerender_location_replace.html?" + + net::EscapeQueryParamValue(dest_url.spec(), false) + "#navigate"); navigate_url = navigate_url.ReplaceComponents(replacements); NavigationOrSwapObserver swap_observer( @@ -2201,21 +2184,20 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // page which does the redirection via a mouse click. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectNavigateToSecondViaClick) { - GURL prerender_url = test_server()->GetURL( - CreateClientRedirect("files/prerender/prerender_page.html")); - GURL destination_url = test_server()->GetURL( - "files/prerender/prerender_page.html"); + GURL prerender_url = embedded_test_server()->GetURL( + CreateClientRedirect("/prerender/prerender_page.html")); + GURL destination_url = + embedded_test_server()->GetURL("/prerender/prerender_page.html"); PrerenderTestURL(prerender_url, FINAL_STATUS_USED, 2); OpenURLViaClick(destination_url); } // Checks that a page served over HTTPS is correctly prerendered. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHttps) { - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, net::SpawnedTestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); - GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); + GURL https_url = https_server.GetURL("/prerender/prerender_page.html"); PrerenderTestURL(https_url, FINAL_STATUS_USED, 1); @@ -2226,19 +2208,17 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHttps) { // page will not count as an "alias" for the prerendered page. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectInIframe) { - std::string redirect_path = CreateClientRedirect( - "/files/prerender/prerender_embedded_content.html"); - std::vector<net::SpawnedTestServer::StringPair> replacement_text; - replacement_text.push_back( - std::make_pair("REPLACE_WITH_URL", "/" + redirect_path)); + std::string redirect_path = + CreateClientRedirect("/prerender/prerender_embedded_content.html"); + base::StringPairs replacement_text; + replacement_text.push_back(std::make_pair("REPLACE_WITH_URL", redirect_path)); std::string replacement_path; - ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( - "files/prerender/prerender_with_iframe.html", - replacement_text, - &replacement_path)); + net::test_server::GetFilePathWithReplacements( + "/prerender/prerender_with_iframe.html", replacement_text, + &replacement_path); PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 2); - EXPECT_FALSE(UrlIsInPrerenderManager( - "files/prerender/prerender_embedded_content.html")); + EXPECT_FALSE( + UrlIsInPrerenderManager("/prerender/prerender_embedded_content.html")); NavigateToDestURL(); } @@ -2247,9 +2227,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // than the final destination page. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderServerRedirectNavigateToFirst) { - PrerenderTestURL(CreateServerRedirect("files/prerender/prerender_page.html"), - FINAL_STATUS_USED, - 1); + PrerenderTestURL(CreateServerRedirect("/prerender/prerender_page.html"), + FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -2258,10 +2237,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // page which does the redirection. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderServerRedirectNavigateToSecond) { - PrerenderTestURL(CreateServerRedirect("files/prerender/prerender_page.html"), - FINAL_STATUS_USED, - 1); - NavigateToURL("files/prerender/prerender_page.html"); + PrerenderTestURL(CreateServerRedirect("/prerender/prerender_page.html"), + FINAL_STATUS_USED, 1); + NavigateToURL("/prerender/prerender_page.html"); } // Checks that server-issued redirects work with prerendering. @@ -2269,10 +2247,10 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // page which does the redirection via a mouse click. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderServerRedirectNavigateToSecondViaClick) { - GURL prerender_url = test_server()->GetURL( - CreateServerRedirect("files/prerender/prerender_page.html")); - GURL destination_url = test_server()->GetURL( - "files/prerender/prerender_page.html"); + GURL prerender_url = embedded_test_server()->GetURL( + CreateServerRedirect("/prerender/prerender_page.html")); + GURL destination_url = + embedded_test_server()->GetURL("/prerender/prerender_page.html"); PrerenderTestURL(prerender_url, FINAL_STATUS_USED, 1); OpenURLViaClick(destination_url); } @@ -2280,52 +2258,45 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // Checks that server-issued redirects within an iframe in a prerendered // page will not count as an "alias" for the prerendered page. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderServerRedirectInIframe) { - std::string redirect_path = CreateServerRedirect( - "/files/prerender/prerender_embedded_content.html"); - std::vector<net::SpawnedTestServer::StringPair> replacement_text; - replacement_text.push_back( - std::make_pair("REPLACE_WITH_URL", "/" + redirect_path)); + std::string redirect_path = + CreateServerRedirect("//prerender/prerender_embedded_content.html"); + base::StringPairs replacement_text; + replacement_text.push_back(std::make_pair("REPLACE_WITH_URL", redirect_path)); std::string replacement_path; - ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( - "files/prerender/prerender_with_iframe.html", - replacement_text, - &replacement_path)); + net::test_server::GetFilePathWithReplacements( + "/prerender/prerender_with_iframe.html", replacement_text, + &replacement_path); PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 1); - EXPECT_FALSE(UrlIsInPrerenderManager( - "files/prerender/prerender_embedded_content.html")); + EXPECT_FALSE( + UrlIsInPrerenderManager("/prerender/prerender_embedded_content.html")); NavigateToDestURL(); } // Prerenders a page that contains an automatic download triggered through an // iframe. This should not prerender successfully. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDownloadIframe) { - PrerenderTestURL("files/prerender/prerender_download_iframe.html", - FINAL_STATUS_DOWNLOAD, - 0); + PrerenderTestURL("/prerender/prerender_download_iframe.html", + FINAL_STATUS_DOWNLOAD, 0); } // Prerenders a page that contains an automatic download triggered through // Javascript changing the window.location. This should not prerender // successfully IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDownloadLocation) { - PrerenderTestURL(CreateClientRedirect("files/download-test1.lib"), - FINAL_STATUS_DOWNLOAD, - 1); + PrerenderTestURL(CreateClientRedirect("/download-test1.lib"), + FINAL_STATUS_DOWNLOAD, 1); } // Prerenders a page that contains an automatic download triggered through a // client-issued redirect. This should not prerender successfully. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDownloadClientRedirect) { - PrerenderTestURL("files/prerender/prerender_download_refresh.html", - FINAL_STATUS_DOWNLOAD, - 1); + PrerenderTestURL("/prerender/prerender_download_refresh.html", + FINAL_STATUS_DOWNLOAD, 1); } // Checks that the referrer is set when prerendering. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderReferrer) { - PrerenderTestURL("files/prerender/prerender_referrer.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_referrer.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -2334,8 +2305,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderReferrer) { IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNoSSLReferrer) { UseHttpsSrcServer(); - PrerenderTestURL("files/prerender/prerender_no_referrer.html", - FINAL_STATUS_USED, + PrerenderTestURL("/prerender/prerender_no_referrer.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -2347,8 +2317,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelReferrer) { content::ContentBrowserClient* original_browser_client = content::SetBrowserClientForTesting(test_content_browser_client.get()); - PrerenderTestURL("files/prerender/prerender_referrer.html", - FINAL_STATUS_CANCELLED, + PrerenderTestURL("/prerender/prerender_referrer.html", FINAL_STATUS_CANCELLED, 1); OpenDestURLViaClick(); @@ -2359,16 +2328,14 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelReferrer) { // Checks that popups on a prerendered page cause cancellation. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPopup) { - PrerenderTestURL("files/prerender/prerender_popup.html", - FINAL_STATUS_CREATE_NEW_WINDOW, - 0); + PrerenderTestURL("/prerender/prerender_popup.html", + FINAL_STATUS_CREATE_NEW_WINDOW, 0); } // Checks that registering a protocol handler causes cancellation. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderRegisterProtocolHandler) { - PrerenderTestURL("files/prerender/prerender_register_protocol_handler.html", - FINAL_STATUS_REGISTER_PROTOCOL_HANDLER, - 0); + PrerenderTestURL("/prerender/prerender_register_protocol_handler.html", + FINAL_STATUS_REGISTER_PROTOCOL_HANDLER, 0); } // Checks that renderers using excessive memory will be terminated. @@ -2381,7 +2348,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderExcessiveMemory) { // message gets through. This happens on XP debug bots because they're so // slow. Instead, don't bother checking the load event count. DisableLoadEventCheck(); - PrerenderTestURL("files/prerender/prerender_excessive_memory.html", + PrerenderTestURL("/prerender/prerender_excessive_memory.html", FINAL_STATUS_MEMORY_LIMIT_EXCEEDED, 0); } @@ -2389,15 +2356,14 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderExcessiveMemory) { IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderQuickQuit) { DisableJavascriptCalls(); DisableLoadEventCheck(); - PrerenderTestURL("files/prerender/prerender_page.html", - FINAL_STATUS_APP_TERMINATING, - 0); + PrerenderTestURL("/prerender/prerender_page.html", + FINAL_STATUS_APP_TERMINATING, 0); } // Checks that we don't prerender in an infinite loop. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderInfiniteLoop) { - const char* const kHtmlFileA = "files/prerender/prerender_infinite_a.html"; - const char* const kHtmlFileB = "files/prerender/prerender_infinite_b.html"; + const char* const kHtmlFileA = "/prerender/prerender_infinite_a.html"; + const char* const kHtmlFileB = "/prerender/prerender_infinite_b.html"; std::vector<FinalStatus> expected_final_status_queue; expected_final_status_queue.push_back(FINAL_STATUS_USED); @@ -2430,11 +2396,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderInfiniteLoop) { IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderInfiniteLoopMultiple) { const char* const kHtmlFileA = - "files/prerender/prerender_infinite_a_multiple.html"; + "/prerender/prerender_infinite_a_multiple.html"; const char* const kHtmlFileB = - "files/prerender/prerender_infinite_b_multiple.html"; + "/prerender/prerender_infinite_b_multiple.html"; const char* const kHtmlFileC = - "files/prerender/prerender_infinite_c_multiple.html"; + "/prerender/prerender_infinite_c_multiple.html"; // This test is conceptually simplest if concurrency is at two, since we // don't have to worry about which of kHtmlFileB or kHtmlFileC gets evicted. @@ -2474,8 +2440,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // Checks that pending prerenders are aborted (and never launched) when launched // by a prerender that itself gets aborted. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAbortPendingOnCancel) { - const char* const kHtmlFileA = "files/prerender/prerender_infinite_a.html"; - const char* const kHtmlFileB = "files/prerender/prerender_infinite_b.html"; + const char* const kHtmlFileA = "/prerender/prerender_infinite_a.html"; + const char* const kHtmlFileB = "/prerender/prerender_infinite_b.html"; scoped_ptr<TestPrerender> prerender = PrerenderTestURL(kHtmlFileA, FINAL_STATUS_CANCELLED, 1); @@ -2514,7 +2480,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, OpenTaskManagerBeforePrerender) { ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, any_prerender)); // Prerender a page in addition to the original tab. - PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1); // A TaskManager entry should appear like "Prerender: Prerender Page" // alongside the original tab entry. There should be just these two entries. @@ -2548,7 +2514,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, OpenTaskManagerAfterPrerender) { const base::string16 final = MatchTaskManagerTab("Prerender Page"); // Start with two resources. - PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1); // Show the task manager. This populates the model. Importantly, we're doing // this after the prerender WebContents already exists - the task manager @@ -2584,7 +2550,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, OpenTaskManagerAfterSwapIn) { const base::string16 final = MatchTaskManagerTab("Prerender Page"); // Prerender, and swap it in. - PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); // Show the task manager. This populates the model. Importantly, we're doing @@ -2600,8 +2566,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, OpenTaskManagerAfterSwapIn) { // Checks that audio loads are deferred on prerendering. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5Audio) { - PrerenderTestURL("files/prerender/prerender_html5_audio.html", - FINAL_STATUS_USED, + PrerenderTestURL("/prerender/prerender_html5_audio.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); WaitForASCIITitle(GetActiveWebContents(), kPassTitle); @@ -2610,9 +2575,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5Audio) { // Checks that audio loads are deferred on prerendering and played back when // the prerender is swapped in if autoplay is set. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5AudioAutoplay) { - PrerenderTestURL("files/prerender/prerender_html5_audio_autoplay.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_html5_audio_autoplay.html", + FINAL_STATUS_USED, 1); NavigateToDestURL(); WaitForASCIITitle(GetActiveWebContents(), kPassTitle); } @@ -2620,17 +2584,15 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5AudioAutoplay) { // Checks that audio loads are deferred on prerendering and played back when // the prerender is swapped in if js starts playing. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5AudioJsplay) { - PrerenderTestURL("files/prerender/prerender_html5_audio_jsplay.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_html5_audio_jsplay.html", + FINAL_STATUS_USED, 1); NavigateToDestURL(); WaitForASCIITitle(GetActiveWebContents(), kPassTitle); } // Checks that video loads are deferred on prerendering. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5Video) { - PrerenderTestURL("files/prerender/prerender_html5_video.html", - FINAL_STATUS_USED, + PrerenderTestURL("/prerender/prerender_html5_video.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); WaitForASCIITitle(GetActiveWebContents(), kPassTitle); @@ -2639,9 +2601,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5Video) { // Checks that video tags inserted by javascript are deferred and played // correctly on swap in. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5VideoJs) { - PrerenderTestURL("files/prerender/prerender_html5_video_script.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_html5_video_script.html", + FINAL_STATUS_USED, 1); NavigateToDestURL(); WaitForASCIITitle(GetActiveWebContents(), kPassTitle); } @@ -2649,10 +2610,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5VideoJs) { // Checks for correct network events by using a busy sleep the javascript. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5VideoNetwork) { DisableJavascriptCalls(); - scoped_ptr<TestPrerender> prerender = - PrerenderTestURL("files/prerender/prerender_html5_video_network.html", - FINAL_STATUS_USED, - 1); + scoped_ptr<TestPrerender> prerender = PrerenderTestURL( + "/prerender/prerender_html5_video_network.html", FINAL_STATUS_USED, 1); WaitForASCIITitle(prerender->contents()->prerender_contents(), kReadyTitle); EXPECT_TRUE(DidPrerenderPass(prerender->contents()->prerender_contents())); NavigateToDestURL(); @@ -2661,9 +2620,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5VideoNetwork) { // Checks that scripts can retrieve the correct window size while prerendering. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderWindowSize) { - PrerenderTestURL("files/prerender/prerender_size.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_size.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -2672,10 +2629,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderWindowSize) { // Checks that prerenderers will terminate when the RenderView crashes. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderRendererCrash) { - scoped_ptr<TestPrerender> prerender = - PrerenderTestURL("files/prerender/prerender_page.html", - FINAL_STATUS_RENDERER_CRASHED, - 1); + scoped_ptr<TestPrerender> prerender = PrerenderTestURL( + "/prerender/prerender_page.html", FINAL_STATUS_RENDERER_CRASHED, 1); // Navigate to about:crash and then wait for the renderer to crash. ASSERT_TRUE(prerender->contents()); @@ -2692,8 +2647,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderRendererCrash) { IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageWithFragment) { - PrerenderTestURL("files/prerender/prerender_page.html#fragment", - FINAL_STATUS_USED, + PrerenderTestURL("/prerender/prerender_page.html#fragment", FINAL_STATUS_USED, 1); ChannelDestructionWatcher channel_close_watcher; @@ -2708,9 +2662,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageWithRedirectedFragment) { PrerenderTestURL( - CreateClientRedirect("files/prerender/prerender_page.html#fragment"), - FINAL_STATUS_USED, - 2); + CreateClientRedirect("/prerender/prerender_page.html#fragment"), + FINAL_STATUS_USED, 2); ChannelDestructionWatcher channel_close_watcher; channel_close_watcher.WatchChannel(browser()->tab_strip_model()-> @@ -2725,36 +2678,30 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // the main page to a fragment. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageNavigateFragment) { - PrerenderTestURL("files/prerender/no_prerender_page.html", - FINAL_STATUS_APP_TERMINATING, - 1); - NavigateToURLWithDisposition( - "files/prerender/no_prerender_page.html#fragment", - CURRENT_TAB, false); + PrerenderTestURL("/prerender/no_prerender_page.html", + FINAL_STATUS_APP_TERMINATING, 1); + NavigateToURLWithDisposition("/prerender/no_prerender_page.html#fragment", + CURRENT_TAB, false); } // Checks that we do not use a prerendered page when we prerender a fragment // but navigate to the main page. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderFragmentNavigatePage) { - PrerenderTestURL("files/prerender/no_prerender_page.html#fragment", - FINAL_STATUS_APP_TERMINATING, - 1); - NavigateToURLWithDisposition( - "files/prerender/no_prerender_page.html", - CURRENT_TAB, false); + PrerenderTestURL("/prerender/no_prerender_page.html#fragment", + FINAL_STATUS_APP_TERMINATING, 1); + NavigateToURLWithDisposition("/prerender/no_prerender_page.html", CURRENT_TAB, + false); } // Checks that we do not use a prerendered page when we prerender a fragment // but navigate to a different fragment on the same page. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderFragmentNavigateFragment) { - PrerenderTestURL("files/prerender/no_prerender_page.html#other_fragment", - FINAL_STATUS_APP_TERMINATING, - 1); - NavigateToURLWithDisposition( - "files/prerender/no_prerender_page.html#fragment", - CURRENT_TAB, false); + PrerenderTestURL("/prerender/no_prerender_page.html#other_fragment", + FINAL_STATUS_APP_TERMINATING, 1); + NavigateToURLWithDisposition("/prerender/no_prerender_page.html#fragment", + CURRENT_TAB, false); } // Checks that we do not use a prerendered page when the page uses a client @@ -2762,121 +2709,101 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectFromFragment) { PrerenderTestURL( - CreateClientRedirect("files/prerender/no_prerender_page.html#fragment"), - FINAL_STATUS_APP_TERMINATING, - 2); - NavigateToURLWithDisposition( - "files/prerender/no_prerender_page.html", - CURRENT_TAB, false); + CreateClientRedirect("/prerender/no_prerender_page.html#fragment"), + FINAL_STATUS_APP_TERMINATING, 2); + NavigateToURLWithDisposition("/prerender/no_prerender_page.html", CURRENT_TAB, + false); } // Checks that we do not use a prerendered page when the page uses a client // redirect to refresh to a fragment on the same page. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClientRedirectToFragment) { - PrerenderTestURL( - CreateClientRedirect("files/prerender/no_prerender_page.html"), - FINAL_STATUS_APP_TERMINATING, - 2); - NavigateToURLWithDisposition( - "files/prerender/no_prerender_page.html#fragment", - CURRENT_TAB, false); + PrerenderTestURL(CreateClientRedirect("/prerender/no_prerender_page.html"), + FINAL_STATUS_APP_TERMINATING, 2); + NavigateToURLWithDisposition("/prerender/no_prerender_page.html#fragment", + CURRENT_TAB, false); } // Checks that we correctly use a prerendered page when the page uses JS to set // the window.location.hash to a fragment on the same page. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageChangeFragmentLocationHash) { - PrerenderTestURL("files/prerender/prerender_fragment_location_hash.html", - FINAL_STATUS_USED, - 1); - NavigateToURL("files/prerender/prerender_fragment_location_hash.html"); + PrerenderTestURL("/prerender/prerender_fragment_location_hash.html", + FINAL_STATUS_USED, 1); + NavigateToURL("/prerender/prerender_fragment_location_hash.html"); } // Checks that prerendering a PNG works correctly. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderImagePng) { DisableJavascriptCalls(); - PrerenderTestURL("files/prerender/image.png", FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/image.png", FINAL_STATUS_USED, 1); NavigateToDestURL(); } // Checks that prerendering a JPG works correctly. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderImageJpeg) { DisableJavascriptCalls(); - PrerenderTestURL("files/prerender/image.jpeg", FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/image.jpeg", FINAL_STATUS_USED, 1); NavigateToDestURL(); } // Checks that a prerender of a CRX will result in a cancellation due to // download. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCrx) { - PrerenderTestURL("files/prerender/extension.crx", FINAL_STATUS_DOWNLOAD, 0); + PrerenderTestURL("/prerender/extension.crx", FINAL_STATUS_DOWNLOAD, 0); } // Checks that xhr GET requests allow prerenders. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderXhrGet) { - PrerenderTestURL("files/prerender/prerender_xhr_get.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_xhr_get.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); } // Checks that xhr HEAD requests allow prerenders. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderXhrHead) { - PrerenderTestURL("files/prerender/prerender_xhr_head.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_xhr_head.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); } // Checks that xhr OPTIONS requests allow prerenders. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderXhrOptions) { - PrerenderTestURL("files/prerender/prerender_xhr_options.html", - FINAL_STATUS_USED, + PrerenderTestURL("/prerender/prerender_xhr_options.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); } // Checks that xhr TRACE requests allow prerenders. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderXhrTrace) { - PrerenderTestURL("files/prerender/prerender_xhr_trace.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_xhr_trace.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); } // Checks that xhr POST requests allow prerenders. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderXhrPost) { - PrerenderTestURL("files/prerender/prerender_xhr_post.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_xhr_post.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); } // Checks that xhr PUT cancels prerenders. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderXhrPut) { - PrerenderTestURL("files/prerender/prerender_xhr_put.html", - FINAL_STATUS_INVALID_HTTP_METHOD, - 1); + PrerenderTestURL("/prerender/prerender_xhr_put.html", + FINAL_STATUS_INVALID_HTTP_METHOD, 1); } // Checks that xhr DELETE cancels prerenders. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderXhrDelete) { - PrerenderTestURL("files/prerender/prerender_xhr_delete.html", - FINAL_STATUS_INVALID_HTTP_METHOD, - 1); + PrerenderTestURL("/prerender/prerender_xhr_delete.html", + FINAL_STATUS_INVALID_HTTP_METHOD, 1); } // Checks that a top-level page which would trigger an SSL error is canceled. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLErrorTopLevel) { - net::SpawnedTestServer::SSLOptions ssl_options; - ssl_options.server_certificate = - net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, ssl_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); - GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); + GURL https_url = https_server.GetURL("/prerender/prerender_page.html"); PrerenderTestURL(https_url, FINAL_STATUS_SSL_ERROR, 0); @@ -2886,22 +2813,18 @@ 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::SpawnedTestServer::SSLOptions ssl_options; - ssl_options.server_certificate = - net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, ssl_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); - GURL https_url = https_server.GetURL("files/prerender/image.jpeg"); - std::vector<net::SpawnedTestServer::StringPair> replacement_text; + GURL https_url = https_server.GetURL("/prerender/image.jpeg"); + base::StringPairs replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_IMAGE_URL", https_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( - "files/prerender/prerender_with_image.html", - replacement_text, - &replacement_path)); + net::test_server::GetFilePathWithReplacements( + "/prerender/prerender_with_image.html", replacement_text, + &replacement_path); PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -2910,23 +2833,19 @@ 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::SpawnedTestServer::SSLOptions ssl_options; - ssl_options.server_certificate = - net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, ssl_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); - GURL https_url = https_server.GetURL( - "files/prerender/prerender_embedded_content.html"); - std::vector<net::SpawnedTestServer::StringPair> replacement_text; + GURL https_url = + https_server.GetURL("/prerender/prerender_embedded_content.html"); + base::StringPairs replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_URL", https_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( - "files/prerender/prerender_with_iframe.html", - replacement_text, - &replacement_path)); + net::test_server::GetFilePathWithReplacements( + "/prerender/prerender_with_iframe.html", replacement_text, + &replacement_path); PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -2934,17 +2853,15 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLErrorIframe) { // Checks that we cancel correctly when window.print() is called. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPrint) { DisableLoadEventCheck(); - PrerenderTestURL("files/prerender/prerender_print.html", - FINAL_STATUS_WINDOW_PRINT, + PrerenderTestURL("/prerender/prerender_print.html", FINAL_STATUS_WINDOW_PRINT, 0); } // Checks that prerenders do not get swapped into target pages that have opened // popups; the BrowsingInstance is not empty. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderTargetHasPopup) { - PrerenderTestURL("files/prerender/prerender_page.html", - FINAL_STATUS_NON_EMPTY_BROWSING_INSTANCE, - 1); + PrerenderTestURL("/prerender/prerender_page.html", + FINAL_STATUS_NON_EMPTY_BROWSING_INSTANCE, 1); OpenURLViaWindowOpen(GURL(url::kAboutBlankURL)); // Switch back to the current tab and attempt to swap it in. @@ -2980,13 +2897,13 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, current_browser()->profile()->GetResourceContext())-> set_client_cert_store_factory_for_testing( base::Bind(&CreateCertStore)); - net::SpawnedTestServer::SSLOptions ssl_options; - ssl_options.request_client_certificate = true; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, ssl_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + net::SSLServerConfig ssl_config; + ssl_config.require_client_cert = true; + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_OK, ssl_config); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); - GURL https_url = https_server.GetURL("files/prerender/prerender_page.html"); + GURL https_url = https_server.GetURL("/prerender/prerender_page.html"); PrerenderTestURL(https_url, FINAL_STATUS_SSL_CLIENT_CERTIFICATE_REQUESTED, 0); } @@ -2998,21 +2915,20 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, current_browser()->profile()->GetResourceContext())-> set_client_cert_store_factory_for_testing( base::Bind(&CreateCertStore)); - net::SpawnedTestServer::SSLOptions ssl_options; - ssl_options.request_client_certificate = true; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, ssl_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + net::SSLServerConfig ssl_config; + ssl_config.require_client_cert = true; + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_OK, ssl_config); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); - GURL https_url = https_server.GetURL("files/prerender/image.jpeg"); - std::vector<net::SpawnedTestServer::StringPair> replacement_text; + GURL https_url = https_server.GetURL("/prerender/image.jpeg"); + base::StringPairs replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_IMAGE_URL", https_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( - "files/prerender/prerender_with_image.html", - replacement_text, - &replacement_path)); + net::test_server::GetFilePathWithReplacements( + "/prerender/prerender_with_image.html", replacement_text, + &replacement_path); PrerenderTestURL(replacement_path, FINAL_STATUS_SSL_CLIENT_CERTIFICATE_REQUESTED, 0); @@ -3025,22 +2941,21 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLClientCertIframe) { current_browser()->profile()->GetResourceContext())-> set_client_cert_store_factory_for_testing( base::Bind(&CreateCertStore)); - net::SpawnedTestServer::SSLOptions ssl_options; - ssl_options.request_client_certificate = true; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, ssl_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + net::SSLServerConfig ssl_config; + ssl_config.require_client_cert = true; + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_OK, ssl_config); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); - GURL https_url = https_server.GetURL( - "files/prerender/prerender_embedded_content.html"); - std::vector<net::SpawnedTestServer::StringPair> replacement_text; + GURL https_url = + https_server.GetURL("/prerender/prerender_embedded_content.html"); + base::StringPairs replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_URL", https_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( - "files/prerender/prerender_with_iframe.html", - replacement_text, - &replacement_path)); + net::test_server::GetFilePathWithReplacements( + "/prerender/prerender_with_iframe.html", replacement_text, + &replacement_path); PrerenderTestURL(replacement_path, FINAL_STATUS_SSL_CLIENT_CERTIFICATE_REQUESTED, 0); @@ -3050,48 +2965,45 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLClientCertIframe) { // Ensures that we do not prerender pages with a safe browsing // interstitial. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSafeBrowsingTopLevel) { - GURL url = test_server()->GetURL("files/prerender/prerender_page.html"); + GURL url = embedded_test_server()->GetURL("/prerender/prerender_page.html"); GetFakeSafeBrowsingDatabaseManager()->SetThreatTypeForUrl( url, safe_browsing::SB_THREAT_TYPE_URL_MALWARE); - PrerenderTestURL("files/prerender/prerender_page.html", - FINAL_STATUS_SAFE_BROWSING, 0); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_SAFE_BROWSING, + 0); } // Ensures that server redirects to a malware page will cancel prerenders. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSafeBrowsingServerRedirect) { - GURL url = test_server()->GetURL("files/prerender/prerender_page.html"); + GURL url = embedded_test_server()->GetURL("/prerender/prerender_page.html"); GetFakeSafeBrowsingDatabaseManager()->SetThreatTypeForUrl( url, safe_browsing::SB_THREAT_TYPE_URL_MALWARE); - PrerenderTestURL(CreateServerRedirect("files/prerender/prerender_page.html"), - FINAL_STATUS_SAFE_BROWSING, - 0); + PrerenderTestURL(CreateServerRedirect("/prerender/prerender_page.html"), + FINAL_STATUS_SAFE_BROWSING, 0); } // Ensures that client redirects to a malware page will cancel prerenders. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSafeBrowsingClientRedirect) { - GURL url = test_server()->GetURL("files/prerender/prerender_page.html"); + GURL url = embedded_test_server()->GetURL("/prerender/prerender_page.html"); GetFakeSafeBrowsingDatabaseManager()->SetThreatTypeForUrl( url, safe_browsing::SB_THREAT_TYPE_URL_MALWARE); - PrerenderTestURL(CreateClientRedirect("files/prerender/prerender_page.html"), - FINAL_STATUS_SAFE_BROWSING, - 1); + PrerenderTestURL(CreateClientRedirect("/prerender/prerender_page.html"), + FINAL_STATUS_SAFE_BROWSING, 1); } // Ensures that we do not prerender pages which have a malware subresource. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSafeBrowsingSubresource) { - GURL image_url = test_server()->GetURL("files/prerender/image.jpeg"); + GURL image_url = embedded_test_server()->GetURL("/prerender/image.jpeg"); GetFakeSafeBrowsingDatabaseManager()->SetThreatTypeForUrl( image_url, safe_browsing::SB_THREAT_TYPE_URL_MALWARE); - std::vector<net::SpawnedTestServer::StringPair> replacement_text; + base::StringPairs replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_IMAGE_URL", image_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( - "files/prerender/prerender_with_image.html", - replacement_text, - &replacement_path)); + net::test_server::GetFilePathWithReplacements( + "/prerender/prerender_with_image.html", replacement_text, + &replacement_path); PrerenderTestURL(replacement_path, FINAL_STATUS_SAFE_BROWSING, 0); @@ -3099,18 +3011,17 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSafeBrowsingSubresource) { // Ensures that we do not prerender pages which have a malware iframe. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSafeBrowsingIframe) { - GURL iframe_url = test_server()->GetURL( - "files/prerender/prerender_embedded_content.html"); + GURL iframe_url = embedded_test_server()->GetURL( + "/prerender/prerender_embedded_content.html"); GetFakeSafeBrowsingDatabaseManager()->SetThreatTypeForUrl( iframe_url, safe_browsing::SB_THREAT_TYPE_URL_MALWARE); - std::vector<net::SpawnedTestServer::StringPair> replacement_text; + base::StringPairs replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_URL", iframe_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( - "files/prerender/prerender_with_iframe.html", - replacement_text, - &replacement_path)); + net::test_server::GetFilePathWithReplacements( + "/prerender/prerender_with_iframe.html", replacement_text, + &replacement_path); PrerenderTestURL(replacement_path, FINAL_STATUS_SAFE_BROWSING, 0); @@ -3120,26 +3031,22 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSafeBrowsingIframe) { // Checks that a local storage read will not cause prerender to fail. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderLocalStorageRead) { - PrerenderTestURL("files/prerender/prerender_localstorage_read.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_localstorage_read.html", + FINAL_STATUS_USED, 1); NavigateToDestURL(); } // Checks that a local storage write will not cause prerender to fail. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderLocalStorageWrite) { - PrerenderTestURL("files/prerender/prerender_localstorage_write.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_localstorage_write.html", + FINAL_STATUS_USED, 1); NavigateToDestURL(); } // Checks that the favicon is properly loaded on prerender. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderFavicon) { - scoped_ptr<TestPrerender> prerender = - PrerenderTestURL("files/prerender/prerender_favicon.html", - FINAL_STATUS_USED, - 1); + scoped_ptr<TestPrerender> prerender = PrerenderTestURL( + "/prerender/prerender_favicon.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); favicon::FaviconDriver* favicon_driver = @@ -3165,8 +3072,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderUnload) { base::Bind(&CreateCountingInterceptorOnIO, unload_url, empty_file, unload_counter.AsWeakPtr())); - set_loader_path("files/prerender/prerender_loader_with_unload.html"); - PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); + set_loader_path("/prerender/prerender_loader_with_unload.html"); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); unload_counter.WaitForCount(1); } @@ -3184,8 +3091,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHangingUnload) { hang_url, empty_file, base::Closure())); - set_loader_path("files/prerender/prerender_loader_with_unload.html"); - PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); + set_loader_path("/prerender/prerender_loader_with_unload.html"); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -3194,9 +3101,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHangingUnload) { // prerendering history is cleared. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearHistory) { scoped_ptr<TestPrerender> prerender = - PrerenderTestURL("files/prerender/prerender_page.html", - FINAL_STATUS_CACHE_OR_HISTORY_CLEARED, - 1); + PrerenderTestURL("/prerender/prerender_page.html", + FINAL_STATUS_CACHE_OR_HISTORY_CLEARED, 1); ClearBrowsingData(current_browser(), BrowsingDataRemover::REMOVE_HISTORY); prerender->WaitForStop(); @@ -3209,9 +3115,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearHistory) { // prerendering history is not cleared. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearCache) { scoped_ptr<TestPrerender> prerender = - PrerenderTestURL("files/prerender/prerender_page.html", - FINAL_STATUS_CACHE_OR_HISTORY_CLEARED, - 1); + PrerenderTestURL("/prerender/prerender_page.html", + FINAL_STATUS_CACHE_OR_HISTORY_CLEARED, 1); ClearBrowsingData(current_browser(), BrowsingDataRemover::REMOVE_CACHE); prerender->WaitForStop(); @@ -3222,10 +3127,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearCache) { } IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelAll) { - scoped_ptr<TestPrerender> prerender = - PrerenderTestURL("files/prerender/prerender_page.html", - FINAL_STATUS_CANCELLED, - 1); + scoped_ptr<TestPrerender> prerender = PrerenderTestURL( + "/prerender/prerender_page.html", FINAL_STATUS_CANCELLED, 1); GetPrerenderManager()->CancelAllPrerenders(); prerender->WaitForStop(); @@ -3234,9 +3137,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelAll) { } IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderEvents) { - scoped_ptr<TestPrerender> prerender = - PrerenderTestURL("files/prerender/prerender_page.html", - FINAL_STATUS_CANCELLED, 1); + scoped_ptr<TestPrerender> prerender = PrerenderTestURL( + "/prerender/prerender_page.html", FINAL_STATUS_CANCELLED, 1); GetPrerenderManager()->CancelAllPrerenders(); prerender->WaitForStop(); @@ -3250,10 +3152,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderEvents) { // should never be started. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelPrerenderWithPrerender) { - scoped_ptr<TestPrerender> prerender = - PrerenderTestURL("files/prerender/prerender_infinite_a.html", - FINAL_STATUS_CANCELLED, - 1); + scoped_ptr<TestPrerender> prerender = PrerenderTestURL( + "/prerender/prerender_infinite_a.html", FINAL_STATUS_CANCELLED, 1); GetPrerenderManager()->CancelAllPrerenders(); prerender->WaitForStop(); @@ -3268,49 +3168,45 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // by a back navigation. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNavigateClickGoBack) { - PrerenderTestURL("files/prerender/prerender_page_with_link.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_page_with_link.html", + FINAL_STATUS_USED, 1); NavigateToDestURL(); ClickToNextPageAfterPrerender(); GoBackToPrerender(); } IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNavigateNavigateGoBack) { - PrerenderTestURL("files/prerender/prerender_page_with_link.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_page_with_link.html", + FINAL_STATUS_USED, 1); NavigateToDestURL(); NavigateToNextPageAfterPrerender(); GoBackToPrerender(); } IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickClickGoBack) { - PrerenderTestURL("files/prerender/prerender_page_with_link.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_page_with_link.html", + FINAL_STATUS_USED, 1); OpenDestURLViaClick(); ClickToNextPageAfterPrerender(); GoBackToPrerender(); } IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNavigateGoBack) { - PrerenderTestURL("files/prerender/prerender_page_with_link.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_page_with_link.html", + FINAL_STATUS_USED, 1); OpenDestURLViaClick(); NavigateToNextPageAfterPrerender(); GoBackToPrerender(); } IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewWindow) { - PrerenderTestURL("files/prerender/prerender_page_with_link.html", + PrerenderTestURL("/prerender/prerender_page_with_link.html", FINAL_STATUS_APP_TERMINATING, 1); OpenDestURLViaClickNewWindow(); } IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewForegroundTab) { - PrerenderTestURL("files/prerender/prerender_page_with_link.html", + PrerenderTestURL("/prerender/prerender_page_with_link.html", FINAL_STATUS_APP_TERMINATING, 1); OpenDestURLViaClickNewForegroundTab(); } @@ -3324,7 +3220,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DevToolsAgentHost::GetOrCreateFor(web_contents)); FakeDevToolsClient client; agent->AttachClient(&client); - const char* url = "files/prerender/prerender_page.html"; + const char* url = "/prerender/prerender_page.html"; PrerenderTestURL(url, FINAL_STATUS_DEVTOOLS_ATTACHED, 1); NavigateToURLWithDisposition(url, CURRENT_TAB, false); agent->DetachClient(); @@ -3333,10 +3229,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // Validate that the sessionStorage namespace remains the same when swapping // in a prerendered page. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSessionStorage) { - set_loader_path("files/prerender/prerender_loader_with_session_storage.html"); - PrerenderTestURL(GetCrossDomainTestUrl("files/prerender/prerender_page.html"), - FINAL_STATUS_USED, - 1); + set_loader_path("/prerender/prerender_loader_with_session_storage.html"); + PrerenderTestURL(GetCrossDomainTestUrl("prerender/prerender_page.html"), + FINAL_STATUS_USED, 1); NavigateToDestURL(); GoBackToPageBeforePrerender(); } @@ -3348,7 +3243,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, ControlGroup) { PrerenderManager::SetMode( PrerenderManager::PRERENDER_MODE_EXPERIMENT_CONTROL_GROUP); DisableJavascriptCalls(); - PrerenderTestURL("files/prerender/prerender_xhr_put.html", + PrerenderTestURL("/prerender/prerender_xhr_put.html", FINAL_STATUS_WOULD_HAVE_BEEN_USED, 0); NavigateToDestURL(); } @@ -3361,7 +3256,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, ControlGroupRendererInitiated) { PrerenderManager::SetMode( PrerenderManager::PRERENDER_MODE_EXPERIMENT_CONTROL_GROUP); DisableJavascriptCalls(); - PrerenderTestURL("files/prerender/prerender_xhr_put.html", + PrerenderTestURL("/prerender/prerender_xhr_put.html", FINAL_STATUS_WOULD_HAVE_BEEN_USED, 0); OpenDestURLViaClick(); } @@ -3378,7 +3273,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MatchCompleteDummy) { std::vector<FinalStatus> expected_final_status_queue; expected_final_status_queue.push_back(FINAL_STATUS_INVALID_HTTP_METHOD); expected_final_status_queue.push_back(FINAL_STATUS_WOULD_HAVE_BEEN_USED); - PrerenderTestURL("files/prerender/prerender_xhr_put.html", + PrerenderTestURL("/prerender/prerender_xhr_put.html", expected_final_status_queue, 1); histogram_tester().ExpectTotalCount("Prerender.none_PerceivedPLT", 1); histogram_tester().ExpectTotalCount("Prerender.none_PerceivedPLTMatched", 0); @@ -3397,10 +3292,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MatchCompleteDummy) { // Checks that the referrer policy is used when prerendering. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderReferrerPolicy) { - set_loader_path("files/prerender/prerender_loader_with_referrer_policy.html"); - PrerenderTestURL("files/prerender/prerender_referrer_policy.html", - FINAL_STATUS_USED, - 1); + set_loader_path("/prerender/prerender_loader_with_referrer_policy.html"); + PrerenderTestURL("/prerender/prerender_referrer_policy.html", + FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -3408,10 +3302,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderReferrerPolicy) { IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSSLReferrerPolicy) { UseHttpsSrcServer(); - set_loader_path("files/prerender/prerender_loader_with_referrer_policy.html"); - PrerenderTestURL("files/prerender/prerender_referrer_policy.html", - FINAL_STATUS_USED, - 1); + set_loader_path("/prerender/prerender_loader_with_referrer_policy.html"); + PrerenderTestURL("/prerender/prerender_referrer_policy.html", + FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -3422,10 +3315,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelReferrerPolicy) { content::ContentBrowserClient* original_browser_client = content::SetBrowserClientForTesting(test_content_browser_client.get()); - set_loader_path("files/prerender/prerender_loader_with_referrer_policy.html"); - PrerenderTestURL("files/prerender/prerender_referrer_policy.html", - FINAL_STATUS_CANCELLED, - 1); + set_loader_path("/prerender/prerender_loader_with_referrer_policy.html"); + PrerenderTestURL("/prerender/prerender_referrer_policy.html", + FINAL_STATUS_CANCELLED, 1); OpenDestURLViaClick(); bool display_test_result = false; @@ -3478,7 +3370,7 @@ class PrerenderBrowserTestWithExtensions : public PrerenderBrowserTest, }; IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, WebNavigation) { - ASSERT_TRUE(StartSpawnedTestServer()); + ASSERT_TRUE(StartEmbeddedTestServer()); extensions::FrameNavigationState::set_allow_extension_scheme(true); // Wait for the extension to set itself up and return control to us. @@ -3486,7 +3378,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, WebNavigation) { extensions::ResultCatcher catcher; - PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1); ChannelDestructionWatcher channel_close_watcher; channel_close_watcher.WatchChannel(browser()->tab_strip_model()-> @@ -3499,7 +3391,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, WebNavigation) { } IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, TabsApi) { - ASSERT_TRUE(StartSpawnedTestServer()); + ASSERT_TRUE(StartEmbeddedTestServer()); extensions::FrameNavigationState::set_allow_extension_scheme(true); // Wait for the extension to set itself up and return control to us. @@ -3507,7 +3399,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, TabsApi) { extensions::ResultCatcher catcher; - PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1); ChannelDestructionWatcher channel_close_watcher; channel_close_watcher.WatchChannel(browser()->tab_strip_model()-> @@ -3526,7 +3418,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, StreamsTest) { PrerenderManager::SetMode( PrerenderManager::PRERENDER_MODE_EXPERIMENT_MATCH_COMPLETE_GROUP); - ASSERT_TRUE(StartSpawnedTestServer()); + ASSERT_TRUE(StartEmbeddedTestServer()); const extensions::Extension* extension = LoadExtension( test_data_dir_.AppendASCII("streams_private/handle_mime_type")); @@ -3537,7 +3429,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, StreamsTest) { ASSERT_TRUE(handler); EXPECT_TRUE(handler->CanHandleMIMEType("application/msword")); - PrerenderTestURL("files/prerender/document.doc", FINAL_STATUS_DOWNLOAD, 0); + PrerenderTestURL("/prerender/document.doc", FINAL_STATUS_DOWNLOAD, 0); // Sanity-check that the extension would have picked up the stream in a normal // navigation had prerender not intercepted it. @@ -3553,14 +3445,13 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, StreamsTest) { IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelSubresourceUnsupportedScheme) { GURL image_url = GURL("invalidscheme://www.google.com/test.jpg"); - std::vector<net::SpawnedTestServer::StringPair> replacement_text; + base::StringPairs replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_IMAGE_URL", image_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( - "files/prerender/prerender_with_image.html", - replacement_text, - &replacement_path)); + net::test_server::GetFilePathWithReplacements( + "/prerender/prerender_with_image.html", replacement_text, + &replacement_path); PrerenderTestURL(replacement_path, FINAL_STATUS_UNSUPPORTED_SCHEME, 0); } @@ -3568,14 +3459,13 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAllowAboutBlankSubresource) { GURL image_url = GURL("about:blank"); - std::vector<net::SpawnedTestServer::StringPair> replacement_text; + base::StringPairs replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_IMAGE_URL", image_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( - "files/prerender/prerender_with_image.html", - replacement_text, - &replacement_path)); + net::test_server::GetFilePathWithReplacements( + "/prerender/prerender_with_image.html", replacement_text, + &replacement_path); PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -3584,16 +3474,15 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // on redirect. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelSubresourceRedirectUnsupportedScheme) { - GURL image_url = test_server()->GetURL( + GURL image_url = embedded_test_server()->GetURL( CreateServerRedirect("invalidscheme://www.google.com/test.jpg")); - std::vector<net::SpawnedTestServer::StringPair> replacement_text; + base::StringPairs replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_IMAGE_URL", image_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( - "files/prerender/prerender_with_image.html", - replacement_text, - &replacement_path)); + net::test_server::GetFilePathWithReplacements( + "/prerender/prerender_with_image.html", replacement_text, + &replacement_path); PrerenderTestURL(replacement_path, FINAL_STATUS_UNSUPPORTED_SCHEME, 0); } @@ -3601,14 +3490,13 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderKeepSubresourceExtensionScheme) { GURL image_url = GURL("chrome-extension://abcdefg/test.jpg"); - std::vector<net::SpawnedTestServer::StringPair> replacement_text; + base::StringPairs replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_IMAGE_URL", image_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( - "files/prerender/prerender_with_image.html", - replacement_text, - &replacement_path)); + net::test_server::GetFilePathWithReplacements( + "/prerender/prerender_with_image.html", replacement_text, + &replacement_path); PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -3617,16 +3505,15 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // prerender. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderKeepSubresourceRedirectExtensionScheme) { - GURL image_url = test_server()->GetURL( + GURL image_url = embedded_test_server()->GetURL( CreateServerRedirect("chrome-extension://abcdefg/test.jpg")); - std::vector<net::SpawnedTestServer::StringPair> replacement_text; + base::StringPairs replacement_text; replacement_text.push_back( std::make_pair("REPLACE_WITH_IMAGE_URL", image_url.spec())); std::string replacement_path; - ASSERT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( - "files/prerender/prerender_with_image.html", - replacement_text, - &replacement_path)); + net::test_server::GetFilePathWithReplacements( + "/prerender/prerender_with_image.html", replacement_text, + &replacement_path); PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -3634,16 +3521,15 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // Checks that non-http/https main page redirects cancel the prerender. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCancelMainFrameRedirectUnsupportedScheme) { - GURL url = test_server()->GetURL( + GURL url = embedded_test_server()->GetURL( CreateServerRedirect("invalidscheme://www.google.com/test.html")); PrerenderTestURL(url, FINAL_STATUS_UNSUPPORTED_SCHEME, 0); } // Checks that media source video loads are deferred on prerendering. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5MediaSourceVideo) { - PrerenderTestURL("files/prerender/prerender_html5_video_media_source.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_html5_video_media_source.html", + FINAL_STATUS_USED, 1); NavigateToDestURL(); WaitForASCIITitle(GetActiveWebContents(), kPassTitle); } @@ -3652,13 +3538,13 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5MediaSourceVideo) { // is cancelled. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderWebAudioDevice) { DisableLoadEventCheck(); - PrerenderTestURL("files/prerender/prerender_web_audio_device.html", + PrerenderTestURL("/prerender/prerender_web_audio_device.html", FINAL_STATUS_CREATING_AUDIO_STREAM, 0); } // Checks that prerenders do not swap in to WebContents being captured. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCapturedWebContents) { - PrerenderTestURL("files/prerender/prerender_page.html", + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_PAGE_BEING_CAPTURED, 1); WebContents* web_contents = GetActiveWebContents(); web_contents->IncrementCapturerCount(gfx::Size()); @@ -3675,9 +3561,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, content::ContentBrowserClient* original_browser_client = content::SetBrowserClientForTesting(&test_browser_client); - PrerenderTestURL( - CreateServerRedirect("files/prerender/prerender_page.html"), - FINAL_STATUS_OPEN_URL, 0); + PrerenderTestURL(CreateServerRedirect("/prerender/prerender_page.html"), + FINAL_STATUS_OPEN_URL, 0); content::SetBrowserClientForTesting(original_browser_client); } @@ -3688,7 +3573,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // See http://crbug.com/341134 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCrossProcessServerRedirectNoHang) { - const char kDestPath[] = "files/prerender/prerender_page.html"; + const char kDestPath[] = "/prerender/prerender_page.html"; // Force everything to be a process swap. SwapProcessesContentBrowserClient test_browser_client; content::ContentBrowserClient* original_browser_client = @@ -3696,9 +3581,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderTestURL(CreateServerRedirect(kDestPath), FINAL_STATUS_OPEN_URL, 0); - ui_test_utils::NavigateToURL( - browser(), - test_server()->GetURL(kDestPath)); + ui_test_utils::NavigateToURL(browser(), + embedded_test_server()->GetURL(kDestPath)); content::SetBrowserClientForTesting(original_browser_client); } @@ -3734,7 +3618,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, CancelMatchCompleteDummy) { expected_final_status_queue.push_back(FINAL_STATUS_JAVASCRIPT_ALERT); expected_final_status_queue.push_back(FINAL_STATUS_CANCELLED); ScopedVector<TestPrerender> prerenders = - PrerenderTestURL("files/prerender/prerender_alert_before_onload.html", + PrerenderTestURL("/prerender/prerender_alert_before_onload.html", expected_final_status_queue, 0); // Cancel the MatchComplete dummy. @@ -3752,10 +3636,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDeferredImage) { // The prerender will not completely load until after the swap, so wait for a // title change before calling DidPrerenderPass. - scoped_ptr<TestPrerender> prerender = - PrerenderTestURL( - "files/prerender/prerender_deferred_image.html", - FINAL_STATUS_USED, 0); + scoped_ptr<TestPrerender> prerender = PrerenderTestURL( + "/prerender/prerender_deferred_image.html", FINAL_STATUS_USED, 0); WaitForASCIITitle(prerender->contents()->prerender_contents(), kReadyTitle); EXPECT_EQ(1, GetPrerenderDomContentLoadedEventCountForLinkNumber(0)); EXPECT_TRUE(DidPrerenderPass(prerender->contents()->prerender_contents())); @@ -3798,10 +3680,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // The prerender will not completely load until after the swap, so wait for a // title change before calling DidPrerenderPass. - scoped_ptr<TestPrerender> prerender = - PrerenderTestURL( - "files/prerender/prerender_deferred_image.html", - FINAL_STATUS_USED, 0); + scoped_ptr<TestPrerender> prerender = PrerenderTestURL( + "/prerender/prerender_deferred_image.html", FINAL_STATUS_USED, 0); WaitForASCIITitle(prerender->contents()->prerender_contents(), kReadyTitle); EXPECT_TRUE(DidPrerenderPass(prerender->contents()->prerender_contents())); EXPECT_EQ(0, prerender->number_of_loads()); @@ -3824,9 +3704,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // Checks that deferred redirects in the main frame are followed. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDeferredMainFrame) { DisableJavascriptCalls(); - PrerenderTestURL( - "files/prerender/image-deferred.png", - FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/image-deferred.png", FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -3835,9 +3713,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDeferredMainFrame) { IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDeferredMainFrameAfterRedirect) { DisableJavascriptCalls(); - PrerenderTestURL( - CreateServerRedirect("files/prerender/image-deferred.png"), - FINAL_STATUS_USED, 1); + PrerenderTestURL(CreateServerRedirect("/prerender/image-deferred.png"), + FINAL_STATUS_USED, 1); NavigateToDestURL(); } @@ -3847,14 +3724,14 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDeferredSynchronousXHR) { RestorePrerenderMode restore_prerender_mode; PrerenderManager::SetMode( PrerenderManager::PRERENDER_MODE_EXPERIMENT_MATCH_COMPLETE_GROUP); - PrerenderTestURL("files/prerender/prerender_deferred_sync_xhr.html", + PrerenderTestURL("/prerender/prerender_deferred_sync_xhr.html", FINAL_STATUS_BAD_DEFERRED_REDIRECT, 0); NavigateToDestURL(); } // Checks that prerenders are not swapped for navigations with extra headers. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderExtraHeadersNoSwap) { - PrerenderTestURL("files/prerender/prerender_page.html", + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_APP_TERMINATING, 1); content::OpenURLParams params(dest_url(), Referrer(), CURRENT_TAB, @@ -3867,7 +3744,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderExtraHeadersNoSwap) { // POST data. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderBrowserInitiatedPostNoSwap) { - PrerenderTestURL("files/prerender/prerender_page.html", + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_APP_TERMINATING, 1); std::string post_data = "DATA"; @@ -3882,15 +3759,14 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // Checks that the prerendering of a page is canceled correctly when the // prerendered page tries to make a second navigation entry. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNewNavigationEntry) { - PrerenderTestURL("files/prerender/prerender_new_entry.html", - FINAL_STATUS_NEW_NAVIGATION_ENTRY, - 1); + PrerenderTestURL("/prerender/prerender_new_entry.html", + FINAL_STATUS_NEW_NAVIGATION_ENTRY, 1); } // Attempt a swap-in in a new tab. The session storage doesn't match, so it // should not swap. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageNewTab) { - PrerenderTestURL("files/prerender/prerender_page.html", + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_APP_TERMINATING, 1); // Open a new tab to navigate in. @@ -3904,7 +3780,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageNewTab) { // Checks that prerenders honor |should_replace_current_entry|. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderReplaceCurrentEntry) { - PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1); content::OpenURLParams params(dest_url(), Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false); @@ -3932,14 +3808,14 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPing) { base::Bind(&CreateCountingInterceptorOnIO, kPingURL, empty_file, ping_counter.AsWeakPtr())); - PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1); OpenDestURLViaClickPing(kPingURL); ping_counter.WaitForCount(1); } IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPPLTNormalNavigation) { - GURL url = test_server()->GetURL("files/prerender/prerender_page.html"); + GURL url = embedded_test_server()->GetURL("/prerender/prerender_page.html"); ui_test_utils::NavigateToURL(current_browser(), url); histogram_tester().ExpectTotalCount("Prerender.none_PerceivedPLT", 1); histogram_tester().ExpectTotalCount("Prerender.none_PerceivedPLTMatched", 0); @@ -3950,7 +3826,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPPLTNormalNavigation) { // Checks that a prerender which calls window.close() on itself is aborted. IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderWindowClose) { DisableLoadEventCheck(); - PrerenderTestURL("files/prerender/prerender_window_close.html", + PrerenderTestURL("/prerender/prerender_window_close.html", FINAL_STATUS_CLOSED, 0); } @@ -3965,16 +3841,15 @@ class PrerenderIncognitoBrowserTest : public PrerenderBrowserTest { // Checks that prerendering works in incognito mode. IN_PROC_BROWSER_TEST_F(PrerenderIncognitoBrowserTest, PrerenderIncognito) { - PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1); NavigateToDestURL(); } // Checks that prerenders are aborted when an incognito profile is closed. IN_PROC_BROWSER_TEST_F(PrerenderIncognitoBrowserTest, PrerenderIncognitoClosed) { - scoped_ptr<TestPrerender> prerender = - PrerenderTestURL("files/prerender/prerender_page.html", - FINAL_STATUS_PROFILE_DESTROYED, 1); + scoped_ptr<TestPrerender> prerender = PrerenderTestURL( + "/prerender/prerender_page.html", FINAL_STATUS_PROFILE_DESTROYED, 1); current_browser()->window()->Close(); prerender->WaitForStop(); } @@ -4027,8 +3902,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderOmniboxBrowserTest, DISABLED_PrerenderOmniboxCancel) { // Fake an omnibox prerender. scoped_ptr<TestPrerender> prerender = StartOmniboxPrerender( - test_server()->GetURL("files/empty.html"), - FINAL_STATUS_CANCELLED); + embedded_test_server()->GetURL("/empty.html"), FINAL_STATUS_CANCELLED); // Revert the location bar. This should cancel the prerender. GetLocationBar()->Revert(); @@ -4047,15 +3921,15 @@ IN_PROC_BROWSER_TEST_F(PrerenderOmniboxBrowserTest, // Enter a URL into the Omnibox. OmniboxView* omnibox_view = GetOmniboxView(); omnibox_view->OnBeforePossibleChange(); - omnibox_view->SetUserText( - base::UTF8ToUTF16(test_server()->GetURL("files/empty.html?1").spec())); + omnibox_view->SetUserText(base::UTF8ToUTF16( + embedded_test_server()->GetURL("/empty.html?1").spec())); omnibox_view->OnAfterPossibleChange(); WaitForAutocompleteDone(omnibox_view); // Fake an omnibox prerender for a different URL. - scoped_ptr<TestPrerender> prerender = StartOmniboxPrerender( - test_server()->GetURL("files/empty.html?2"), - FINAL_STATUS_APP_TERMINATING); + scoped_ptr<TestPrerender> prerender = + StartOmniboxPrerender(embedded_test_server()->GetURL("/empty.html?2"), + FINAL_STATUS_APP_TERMINATING); // The final status may be either FINAL_STATUS_APP_TERMINATING or // FINAL_STATUS_CANCELLED. Although closing the omnibox will not cancel an @@ -4094,9 +3968,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithNaCl, return; #endif - PrerenderTestURL("files/prerender/prerender_plugin_nacl_enabled.html", - FINAL_STATUS_USED, - 1); + PrerenderTestURL("/prerender/prerender_plugin_nacl_enabled.html", + FINAL_STATUS_USED, 1); NavigateToDestURL(); // To avoid any chance of a race, we have to let the script send its response @@ -4131,7 +4004,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, TaskManagementTagsBasic) { EXPECT_EQ(1U, GetTrackedTags().size()); // Start prerendering a page and make sure it's correctly tagged. - PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1); EXPECT_EQ(2U, GetTrackedTags().size()); // Swap in the prerendered content and make sure its tag is removed. @@ -4152,7 +4025,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, TaskManagementTasksProvided) { EXPECT_EQ(1U, task_manager.tasks().size()); // Start prerendering a page. - PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); + PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1); EXPECT_EQ(2U, GetTrackedTags().size()); ASSERT_EQ(2U, task_manager.tasks().size()); diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc index 3ab5dff..4d64753 100644 --- a/chrome/browser/printing/printing_layout_browsertest.cc +++ b/chrome/browser/printing/printing_layout_browsertest.cc @@ -26,7 +26,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/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "printing/image.h" #include "printing/printing_test.h" @@ -339,10 +339,10 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTextTest, DISABLED_Complex) { "close_printdlg_thread"); // Print a document, check its output. - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL("files/printing/test1.html")); + browser(), embedded_test_server()->GetURL("/printing/test1.html")); close_printdlg_thread.Start(); PrintNowTab(); close_printdlg_thread.Join(); @@ -355,12 +355,12 @@ struct TestPool { }; const TestPool kTestPool[] = { - // ImagesB&W - "files/printing/test2.html", L"test2", - // ImagesTransparent - "files/printing/test3.html", L"test3", - // ImageColor - "files/printing/test4.html", L"test4", + // ImagesB&W + "/printing/test2.html", L"test2", + // ImagesTransparent + "/printing/test3.html", L"test3", + // ImageColor + "/printing/test4.html", L"test4", }; // http://crbug.com/7721 @@ -368,7 +368,7 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTest, DISABLED_ManyTimes) { if (IsTestCaseDisabled()) return; - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); DismissTheWindow dismisser; @@ -377,7 +377,8 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTest, DISABLED_ManyTimes) { if (i) CleanupDumpDirectory(); const TestPool& test = kTestPool[i % arraysize(kTestPool)]; - ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(test.source)); + ui_test_utils::NavigateToURL(browser(), + embedded_test_server()->GetURL(test.source)); base::DelegateSimpleThread close_printdlg_thread1(&dismisser, "close_printdlg_thread"); EXPECT_EQ(NULL, FindDialogWindow(dismisser.owner_process())); @@ -417,11 +418,12 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTest, DISABLED_Delayed) { if (IsTestCaseDisabled()) return; - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); { bool is_timeout = true; - GURL url = test_server()->GetURL("files/printing/popup_delayed_print.htm"); + GURL url = + embedded_test_server()->GetURL("/printing/popup_delayed_print.htm"); ui_test_utils::NavigateToURL(browser(), url); DismissTheWindow dismisser; @@ -431,7 +433,7 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTest, DISABLED_Delayed) { close_printdlg_thread.Join(); // Force a navigation elsewhere to verify that it's fine with it. - url = test_server()->GetURL("files/printing/test1.html"); + url = embedded_test_server()->GetURL("/printing/test1.html"); ui_test_utils::NavigateToURL(browser(), url); } chrome::CloseWindow(browser()); @@ -446,10 +448,10 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTest, DISABLED_IFrame) { if (IsTestCaseDisabled()) return; - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); { - GURL url = test_server()->GetURL("files/printing/iframe.htm"); + GURL url = embedded_test_server()->GetURL("/printing/iframe.htm"); ui_test_utils::NavigateToURL(browser(), url); DismissTheWindow dismisser; @@ -459,7 +461,7 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTest, DISABLED_IFrame) { close_printdlg_thread.Join(); // Force a navigation elsewhere to verify that it's fine with it. - url = test_server()->GetURL("files/printing/test1.html"); + url = embedded_test_server()->GetURL("/printing/test1.html"); ui_test_utils::NavigateToURL(browser(), url); } chrome::CloseWindow(browser()); diff --git a/chrome/browser/profiles/host_zoom_map_browsertest.cc b/chrome/browser/profiles/host_zoom_map_browsertest.cc index 9bf73bf..f3d7764 100644 --- a/chrome/browser/profiles/host_zoom_map_browsertest.cc +++ b/chrome/browser/profiles/host_zoom_map_browsertest.cc @@ -140,7 +140,7 @@ class HostZoomMapBrowserTest : public InProcessBrowserTest { // BrowserTestBase: void SetUpOnMainThread() override { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); embedded_test_server()->RegisterRequestHandler(base::Bind( &HostZoomMapBrowserTest::HandleRequest, base::Unretained(this))); host_resolver()->AddRule("*", "127.0.0.1"); diff --git a/chrome/browser/profiles/profile_window_browsertest.cc b/chrome/browser/profiles/profile_window_browsertest.cc index fa6ddd0..6d7ef46 100644 --- a/chrome/browser/profiles/profile_window_browsertest.cc +++ b/chrome/browser/profiles/profile_window_browsertest.cc @@ -27,7 +27,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" // This test verifies the Desktop implementation of Guest only. #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) @@ -170,8 +170,8 @@ IN_PROC_BROWSER_TEST_F(ProfileWindowBrowserTest, GuestClearsCookies) { Browser* guest_browser = OpenGuestBrowser(); Profile* guest_profile = guest_browser->profile(); - ASSERT_TRUE(test_server()->Start()); - GURL url(test_server()->GetURL("set-cookie?cookie1")); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL url(embedded_test_server()->GetURL("/set-cookie?cookie1")); // Before navigation there are no cookies for the URL. std::string cookie = content::GetCookies(guest_profile, url); diff --git a/chrome/browser/push_messaging/push_messaging_browsertest.cc b/chrome/browser/push_messaging/push_messaging_browsertest.cc index 587b355..c0a0554 100644 --- a/chrome/browser/push_messaging/push_messaging_browsertest.cc +++ b/chrome/browser/push_messaging/push_messaging_browsertest.cc @@ -40,6 +40,7 @@ #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "ui/base/window_open_disposition.h" #if defined(ENABLE_BACKGROUND) @@ -88,11 +89,9 @@ class PushMessagingBrowserTest : public InProcessBrowserTest { // InProcessBrowserTest: void SetUp() override { - https_server_.reset(new net::SpawnedTestServer( - net::SpawnedTestServer::TYPE_HTTPS, - net::BaseTestServer::SSLOptions( - net::BaseTestServer::SSLOptions::CERT_OK), - base::FilePath(FILE_PATH_LITERAL("chrome/test/data/")))); + https_server_.reset( + new net::EmbeddedTestServer(net::EmbeddedTestServer::TYPE_HTTPS)); + https_server_->ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server_->Start()); #if defined(ENABLE_NOTIFICATIONS) @@ -185,7 +184,7 @@ class PushMessagingBrowserTest : public InProcessBrowserTest { const PushMessagingAppIdentifier& app_identifier, const gcm::IncomingMessage& message); - net::SpawnedTestServer* https_server() const { return https_server_.get(); } + net::EmbeddedTestServer* https_server() const { return https_server_.get(); } gcm::FakeGCMProfileService* gcm_service() const { return gcm_service_; } @@ -214,14 +213,12 @@ class PushMessagingBrowserTest : public InProcessBrowserTest { PushMessagingServiceImpl* push_service() const { return push_service_; } protected: - virtual std::string GetTestURL() { - return "files/push_messaging/test.html"; - } + virtual std::string GetTestURL() { return "/push_messaging/test.html"; } virtual Browser* GetBrowser() const { return browser(); } private: - scoped_ptr<net::SpawnedTestServer> https_server_; + scoped_ptr<net::EmbeddedTestServer> https_server_; gcm::FakeGCMProfileService* gcm_service_; PushMessagingServiceImpl* push_service_; @@ -235,7 +232,7 @@ class PushMessagingBrowserTest : public InProcessBrowserTest { class PushMessagingBrowserTestEmptySubscriptionOptions : public PushMessagingBrowserTest { std::string GetTestURL() override { - return "files/push_messaging/test_no_subscription_options.html"; + return "/push_messaging/test_no_subscription_options.html"; } }; @@ -272,7 +269,7 @@ void PushMessagingBrowserTest::TryToSubscribeSuccessfully( PushMessagingAppIdentifier PushMessagingBrowserTest::GetAppIdentifierForServiceWorkerRegistration( int64 service_worker_registration_id) { - GURL origin = https_server()->GetURL(std::string()).GetOrigin(); + GURL origin = https_server()->GetURL("/").GetOrigin(); PushMessagingAppIdentifier app_identifier = PushMessagingAppIdentifier::FindByServiceWorker( GetBrowser()->profile(), origin, service_worker_registration_id); @@ -382,24 +379,24 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, MAYBE_SubscribePersisted) { GetAppIdentifierForServiceWorkerRegistration(0LL); EXPECT_EQ(sw0_identifier.app_id(), gcm_service()->last_registered_app_id()); - LoadTestPage("files/push_messaging/subscope1/test.html"); + LoadTestPage("/push_messaging/subscope1/test.html"); ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result)); ASSERT_EQ("ok - service worker registered", script_result); - LoadTestPage("files/push_messaging/subscope2/test.html"); + LoadTestPage("/push_messaging/subscope2/test.html"); ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result)); ASSERT_EQ("ok - service worker registered", script_result); // Note that we need to reload the page after registering, otherwise // navigator.serviceWorker.ready is going to be resolved with the parent // Service Worker which still controls the page. - LoadTestPage("files/push_messaging/subscope2/test.html"); + LoadTestPage("/push_messaging/subscope2/test.html"); TryToSubscribeSuccessfully("1-1" /* expected_push_subscription_id */); PushMessagingAppIdentifier sw2_identifier = GetAppIdentifierForServiceWorkerRegistration(2LL); EXPECT_EQ(sw2_identifier.app_id(), gcm_service()->last_registered_app_id()); - LoadTestPage("files/push_messaging/subscope1/test.html"); + LoadTestPage("/push_messaging/subscope1/test.html"); TryToSubscribeSuccessfully("1-2" /* expected_push_subscription_id */); PushMessagingAppIdentifier sw1_identifier = GetAppIdentifierForServiceWorkerRegistration(1LL); @@ -413,11 +410,11 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, MAYBE_SubscribePersisted) { // test server uses random port numbers for each test (even PRE_Foo and Foo), // so we wouldn't be able to load the test pages with the same origin. - LoadTestPage("files/push_messaging/subscope1/test.html"); + LoadTestPage("/push_messaging/subscope1/test.html"); TryToSubscribeSuccessfully("1-2" /* expected_push_subscription_id */); EXPECT_EQ(sw1_identifier.app_id(), gcm_service()->last_registered_app_id()); - LoadTestPage("files/push_messaging/subscope2/test.html"); + LoadTestPage("/push_messaging/subscope2/test.html"); TryToSubscribeSuccessfully("1-1" /* expected_push_subscription_id */); EXPECT_EQ(sw1_identifier.app_id(), gcm_service()->last_registered_app_id()); @@ -856,7 +853,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, push_service()->SetContentSettingChangedCallbackForTesting( message_loop_runner->QuitClosure()); - GURL origin = https_server()->GetURL(std::string()).GetOrigin(); + GURL origin = https_server()->GetURL("/").GetOrigin(); HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile()) ->SetContentSetting(ContentSettingsPattern::FromURLNoWildcard(origin), ContentSettingsPattern::FromURLNoWildcard(origin), @@ -890,7 +887,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, push_service()->SetContentSettingChangedCallbackForTesting( message_loop_runner->QuitClosure()); - GURL origin = https_server()->GetURL(std::string()).GetOrigin(); + GURL origin = https_server()->GetURL("/").GetOrigin(); HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile()) ->SetContentSetting(ContentSettingsPattern::FromURLNoWildcard(origin), ContentSettingsPattern::FromURLNoWildcard(origin), @@ -953,7 +950,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, push_service()->SetContentSettingChangedCallbackForTesting( message_loop_runner->QuitClosure()); - GURL origin = https_server()->GetURL(std::string()).GetOrigin(); + GURL origin = https_server()->GetURL("/").GetOrigin(); HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile()) ->SetContentSetting(ContentSettingsPattern::FromURLNoWildcard(origin), ContentSettingsPattern::Wildcard(), @@ -987,7 +984,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, push_service()->SetContentSettingChangedCallbackForTesting( message_loop_runner->QuitClosure()); - GURL origin = https_server()->GetURL(std::string()).GetOrigin(); + GURL origin = https_server()->GetURL("/").GetOrigin(); HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile()) ->SetContentSetting(ContentSettingsPattern::FromURLNoWildcard(origin), ContentSettingsPattern::Wildcard(), @@ -1021,7 +1018,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, push_service()->SetContentSettingChangedCallbackForTesting( base::BarrierClosure(2, message_loop_runner->QuitClosure())); - GURL origin = https_server()->GetURL(std::string()).GetOrigin(); + GURL origin = https_server()->GetURL("/").GetOrigin(); HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile()) ->SetContentSetting(ContentSettingsPattern::FromURLNoWildcard(origin), ContentSettingsPattern::Wildcard(), @@ -1065,7 +1062,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, push_service()->SetContentSettingChangedCallbackForTesting( base::BarrierClosure(4, message_loop_runner->QuitClosure())); - GURL origin = https_server()->GetURL(std::string()).GetOrigin(); + GURL origin = https_server()->GetURL("/").GetOrigin(); HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile()) ->SetContentSetting(ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(), diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc index 648911d..d1a19c8 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc @@ -41,6 +41,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" #include "net/base/load_flags.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_filter.h" #include "net/url_request/url_request_interceptor.h" @@ -225,8 +226,8 @@ IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest, OpenInNewTabReferrer) { ui_test_utils::WindowedTabAddedNotificationObserver tab_observer( content::NotificationService::AllSources()); - ASSERT_TRUE(test_server()->Start()); - GURL echoheader(test_server()->GetURL("echoheader?Referer")); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL echoheader(embedded_test_server()->GetURL("/echoheader?Referer")); // Go to a |page| with a link to echoheader URL. GURL page("data:text/html,<a href='" + echoheader.spec() + "'>link</a>"); @@ -276,8 +277,8 @@ IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest, OpenIncognitoNoneReferrer) { ui_test_utils::WindowedTabAddedNotificationObserver tab_observer( content::NotificationService::AllSources()); - ASSERT_TRUE(test_server()->Start()); - GURL echoheader(test_server()->GetURL("echoheader?Referer")); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL echoheader(embedded_test_server()->GetURL("/echoheader?Referer")); // Go to a |page| with a link to echoheader URL. GURL page("data:text/html,<a href='" + echoheader.spec() + "'>link</a>"); @@ -590,12 +591,12 @@ class SearchByImageBrowserTest : public InProcessBrowserTest { void SetupAndLoadImagePage(const std::string& image_path) { // The test server must start first, so that we know the port that the test // server is using. - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); SetupImageSearchEngine(); // Go to a page with an image in it. The test server doesn't serve the image // with the right MIME type, so use a data URL to make a page containing it. - GURL image_url(test_server()->GetURL(image_path)); + GURL image_url(embedded_test_server()->GetURL(image_path)); GURL page("data:text/html,<img src='" + image_url.spec() + "'>"); ui_test_utils::NavigateToURL(browser(), page); } @@ -612,14 +613,14 @@ class SearchByImageBrowserTest : public InProcessBrowserTest { } GURL GetImageSearchURL() { - static const char kImageSearchURL[] = "imagesearch"; - return test_server()->GetURL(kImageSearchURL); + static const char kImageSearchURL[] = "/imagesearch"; + return embedded_test_server()->GetURL(kImageSearchURL); } private: void SetupImageSearchEngine() { static const char kShortName[] = "test"; - static const char kSearchURL[] = "search?q={searchTerms}"; + static const char kSearchURL[] = "/search?q={searchTerms}"; static const char kImageSearchPostParams[] = "thumb={google:imageThumbnail}"; @@ -632,7 +633,7 @@ class SearchByImageBrowserTest : public InProcessBrowserTest { TemplateURLData data; data.SetShortName(base::ASCIIToUTF16(kShortName)); data.SetKeyword(data.short_name()); - data.SetURL(test_server()->GetURL(kSearchURL).spec()); + data.SetURL(embedded_test_server()->GetURL(kSearchURL).spec()); data.image_url = GetImageSearchURL().spec(); data.image_url_post_params = kImageSearchPostParams; @@ -650,7 +651,7 @@ class SearchByImageBrowserTest : public InProcessBrowserTest { }; IN_PROC_BROWSER_TEST_F(SearchByImageBrowserTest, ImageSearchWithValidImage) { - static const char kValidImage[] = "files/image_search/valid.png"; + static const char kValidImage[] = "/image_search/valid.png"; SetupAndLoadImagePage(kValidImage); ui_test_utils::WindowedTabAddedNotificationObserver tab_observer( @@ -665,7 +666,7 @@ IN_PROC_BROWSER_TEST_F(SearchByImageBrowserTest, ImageSearchWithValidImage) { } IN_PROC_BROWSER_TEST_F(SearchByImageBrowserTest, ImageSearchWithCorruptImage) { - static const char kCorruptImage[] = "files/image_search/corrupt.png"; + static const char kCorruptImage[] = "/image_search/corrupt.png"; SetupAndLoadImagePage(kCorruptImage); content::WebContents* tab = @@ -748,9 +749,10 @@ class LoadImageRequestInterceptor : public net::URLRequestInterceptor { class LoadImageBrowserTest : public InProcessBrowserTest { protected: void SetupAndLoadImagePage(const std::string& image_path) { + ASSERT_TRUE(embedded_test_server()->Start()); // Go to a page with an image in it. The test server doesn't serve the image // with the right MIME type, so use a data URL to make a page containing it. - GURL image_url(test_server()->GetURL(image_path)); + GURL image_url(embedded_test_server()->GetURL(image_path)); GURL page("data:text/html,<img src='" + image_url.spec() + "'>"); ui_test_utils::NavigateToURL(browser(), page); } @@ -762,7 +764,7 @@ class LoadImageBrowserTest : public InProcessBrowserTest { content::BrowserThread::IO, FROM_HERE, base::Bind(&LoadImageBrowserTest::AddInterceptorForURL, base::Unretained(this), - GURL(test_server()->GetURL(image_path).spec()), + GURL(embedded_test_server()->GetURL(image_path).spec()), base::Passed(&owned_interceptor))); } @@ -791,7 +793,7 @@ class LoadImageBrowserTest : public InProcessBrowserTest { }; IN_PROC_BROWSER_TEST_F(LoadImageBrowserTest, LoadImage) { - static const char kValidImage[] = "files/load_image/image.png"; + static const char kValidImage[] = "/load_image/image.png"; SetupAndLoadImagePage(kValidImage); AddLoadImageInterceptor(kValidImage); AttemptLoadImage(); diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc index 61829da..081cd65 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc @@ -105,7 +105,7 @@ class ChromeResourceDispatcherHostDelegateBrowserTest : embedded_test_server()->RegisterRequestHandler( base::Bind(&HandleTestRequest)); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Tell chrome that this is our DM server. dm_url_ = embedded_test_server()->GetURL("/DeviceManagement"); diff --git a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc index af6a727..774a1ee 100644 --- a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc +++ b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc @@ -551,7 +551,7 @@ class ChromeRenderProcessHostBackgroundingTest } void SetUpOnMainThread() override { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Set up the server and get the test pages. base::FilePath test_data_dir; diff --git a/chrome/browser/repost_form_warning_browsertest.cc b/chrome/browser/repost_form_warning_browsertest.cc index 0a17796..e594e67 100644 --- a/chrome/browser/repost_form_warning_browsertest.cc +++ b/chrome/browser/repost_form_warning_browsertest.cc @@ -13,7 +13,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/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" using web_modal::WebContentsModalDialogManager; @@ -21,11 +21,11 @@ typedef InProcessBrowserTest RepostFormWarningTest; // If becomes flaky, disable on Windows and use http://crbug.com/47228 IN_PROC_BROWSER_TEST_F(RepostFormWarningTest, TestDoubleReload) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Load a form. - ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL("files/form.html")); + ui_test_utils::NavigateToURL(browser(), + embedded_test_server()->GetURL("/form.html")); // Submit it. ui_test_utils::NavigateToURL( browser(), @@ -43,7 +43,8 @@ IN_PROC_BROWSER_TEST_F(RepostFormWarningTest, TestDoubleReload) { EXPECT_TRUE(web_contents_modal_dialog_manager->IsDialogActive()); // Navigate away from the page (this is when the test usually crashes). - ui_test_utils::NavigateToURL(browser(), test_server()->GetURL("bar")); + ui_test_utils::NavigateToURL(browser(), + embedded_test_server()->GetURL("/bar")); // The dialog should've been closed. EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive()); @@ -51,11 +52,11 @@ IN_PROC_BROWSER_TEST_F(RepostFormWarningTest, TestDoubleReload) { // If becomes flaky, disable on Windows and use http://crbug.com/47228 IN_PROC_BROWSER_TEST_F(RepostFormWarningTest, TestLoginAfterRepost) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Load a form. - ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL("files/form.html")); + ui_test_utils::NavigateToURL(browser(), + embedded_test_server()->GetURL("/form.html")); // Submit it. ui_test_utils::NavigateToURL( browser(), @@ -73,8 +74,8 @@ IN_PROC_BROWSER_TEST_F(RepostFormWarningTest, TestLoginAfterRepost) { chrome::NOTIFICATION_AUTH_NEEDED, content::Source<content::NavigationController>(&controller)); browser()->OpenURL(content::OpenURLParams( - test_server()->GetURL("auth-basic"), content::Referrer(), CURRENT_TAB, - ui::PAGE_TRANSITION_TYPED, false)); + embedded_test_server()->GetURL("/auth-basic"), content::Referrer(), + CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); observer.Wait(); // Try to reload it again. @@ -85,7 +86,7 @@ IN_PROC_BROWSER_TEST_F(RepostFormWarningTest, TestLoginAfterRepost) { // happen while the auth dialog is up. content::TestNavigationObserver navigation_observer(web_contents); browser()->OpenURL(content::OpenURLParams( - test_server()->GetURL("bar"), content::Referrer(), CURRENT_TAB, - ui::PAGE_TRANSITION_TYPED, false)); + embedded_test_server()->GetURL("/bar"), content::Referrer(), CURRENT_TAB, + ui::PAGE_TRANSITION_TYPED, false)); navigation_observer.Wait(); } diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index f0c507b..f9eb365 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -461,7 +461,7 @@ class SafeBrowsingServiceTest : public InProcessBrowserTest { base::FilePath test_data_dir; PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir); embedded_test_server()->ServeFilesFromDirectory(test_data_dir); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); } // This will setup the "url" prefix in database and prepare protocol manager @@ -1175,7 +1175,7 @@ class SafeBrowsingDatabaseManagerCookieTest : public InProcessBrowserTest { void SetUp() override { // We need to start the test server to get the host&port in the url. - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); embedded_test_server()->RegisterRequestHandler( base::Bind(&SafeBrowsingDatabaseManagerCookieTest::HandleRequest)); diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index b520168..21d992b 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -48,6 +48,7 @@ #include "net/dns/host_resolver.h" #include "net/log/net_log.h" #include "net/test/python_utils.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_request_status.h" @@ -254,7 +255,7 @@ class SafeBrowsingServerTest : public InProcessBrowserTest { return local_database_manager()->safe_browsing_task_runner_; } - const net::SpawnedTestServer& test_server() const { + const net::SpawnedTestServer& spawned_test_server() const { return *test_server_; } @@ -540,8 +541,9 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServerTest, } // Fetches URLs to verify and waits till server responses with data. - EXPECT_EQ(net::URLRequestStatus::SUCCESS, - safe_browsing_helper->FetchUrlsToVerify(test_server(), step)); + EXPECT_EQ( + net::URLRequestStatus::SUCCESS, + safe_browsing_helper->FetchUrlsToVerify(spawned_test_server(), step)); std::vector<PhishingUrl> phishing_urls; EXPECT_TRUE(ParsePhishingUrls(safe_browsing_helper->response_data(), @@ -569,15 +571,17 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServerTest, } // TODO(lzheng): We should verify the fetched database with local // database to make sure they match. - EXPECT_EQ(net::URLRequestStatus::SUCCESS, - safe_browsing_helper->FetchDBToVerify(test_server(), step)); + EXPECT_EQ( + net::URLRequestStatus::SUCCESS, + safe_browsing_helper->FetchDBToVerify(spawned_test_server(), step)); EXPECT_GT(safe_browsing_helper->response_data().size(), 0U); last_step = step; } // Verifies with server if test is done and waits till server responses. EXPECT_EQ(net::URLRequestStatus::SUCCESS, - safe_browsing_helper->VerifyTestComplete(test_server(), last_step)); + safe_browsing_helper->VerifyTestComplete(spawned_test_server(), + last_step)); EXPECT_EQ("yes", safe_browsing_helper->response_data()); } diff --git a/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc b/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc index 904a637..034abca 100644 --- a/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc +++ b/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" #include "components/suggestions/image_fetcher_delegate.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" @@ -23,8 +23,8 @@ namespace suggestions { namespace { const char kTestUrl[] = "http://go.com/"; -const char kTestImagePath[] = "files/image_decoding/droids.png"; -const char kInvalidImagePath[] = "files/DOESNOTEXIST"; +const char kTestImagePath[] = "/image_decoding/droids.png"; +const char kInvalidImagePath[] = "/DOESNOTEXIST"; const base::FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); @@ -58,19 +58,15 @@ class TestImageFetcherDelegate : public ImageFetcherDelegate { class ImageFetcherImplBrowserTest : public InProcessBrowserTest { protected: ImageFetcherImplBrowserTest() - : num_callback_valid_called_(0), - num_callback_null_called_(0), - test_server_(net::SpawnedTestServer::TYPE_HTTP, - net::SpawnedTestServer::kLocalhost, - base::FilePath(kDocRoot)) {} + : num_callback_valid_called_(0), num_callback_null_called_(0) { + test_server_.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot)); + } void SetUpInProcessBrowserTestFixture() override { ASSERT_TRUE(test_server_.Start()); InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); } - void TearDownInProcessBrowserTestFixture() override { test_server_.Stop(); } - ImageFetcherImpl* CreateImageFetcher() { ImageFetcherImpl* fetcher = new ImageFetcherImpl(browser()->profile()->GetRequestContext()); @@ -104,7 +100,7 @@ class ImageFetcherImplBrowserTest : public InProcessBrowserTest { int num_callback_valid_called_; int num_callback_null_called_; - net::SpawnedTestServer test_server_; + net::EmbeddedTestServer test_server_; TestImageFetcherDelegate delegate_; DISALLOW_COPY_AND_ASSIGN(ImageFetcherImplBrowserTest); diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 9dec1aa..975f35e 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -50,6 +50,7 @@ #include "content/public/common/bindings_policy.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "sync/protocol/session_specifics.pb.h" #include "ui/base/page_transition_types.h" @@ -965,9 +966,9 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoresForwardAndBackwardNavs) { // This test fails. See http://crbug.com/237497. IN_PROC_BROWSER_TEST_F(SessionRestoreTest, DISABLED_RestoresCrossSiteForwardAndBackwardNavs) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); - GURL cross_site_url(test_server()->GetURL("files/title2.html")); + GURL cross_site_url(embedded_test_server()->GetURL("/title2.html")); // Visit URLs on different sites. ui_test_utils::NavigateToURL(browser(), url1_); diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc index 725c66f..cc65c1d 100644 --- a/chrome/browser/sessions/tab_restore_browsertest.cc +++ b/chrome/browser/sessions/tab_restore_browsertest.cc @@ -411,7 +411,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreIntoSameWindow) { // Tests that a duplicate history entry is not created when we restore a page // to an existing SiteInstance. (Bug 1230446) IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWithExistingSiteInstance) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL http_url1(embedded_test_server()->GetURL("/title1.html")); GURL http_url2(embedded_test_server()->GetURL("/title2.html")); @@ -468,7 +468,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWithExistingSiteInstance) { // already exists. (Bug 1204135) IN_PROC_BROWSER_TEST_F(TabRestoreTest, MAYBE_RestoreCrossSiteWithExistingSiteInstance) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL http_url1(embedded_test_server()->GetURL("/title1.html")); GURL http_url2(embedded_test_server()->GetURL("/title2.html")); @@ -591,7 +591,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreTabWithSpecialURL) { // Restore tab with special URL in its navigation history, go back to that // entry and see that it loads properly. See http://crbug.com/31905 IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreTabWithSpecialURLOnBack) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); const GURL http_url(embedded_test_server()->GetURL("/title1.html")); diff --git a/chrome/browser/site_details_browsertest.cc b/chrome/browser/site_details_browsertest.cc index a11d9b2..fb5ac9d 100644 --- a/chrome/browser/site_details_browsertest.cc +++ b/chrome/browser/site_details_browsertest.cc @@ -95,7 +95,7 @@ class SiteDetailsBrowserTest : public ExtensionBrowserTest { ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir)); embedded_test_server()->ServeFilesFromDirectory( test_data_dir.AppendASCII("content/test/data/")); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); } // Create and install an extension that has a couple of web-accessible diff --git a/chrome/browser/speech/speech_recognition_browsertest.cc b/chrome/browser/speech/speech_recognition_browsertest.cc index ceb0ff1..ca242a4 100644 --- a/chrome/browser/speech/speech_recognition_browsertest.cc +++ b/chrome/browser/speech/speech_recognition_browsertest.cc @@ -80,16 +80,14 @@ class SpeechWebContentsObserver : public content::WebContentsObserver { // when a WebContents goes away (WCO::WebContentsDestroyed) or the RVH // changes within a WebContents (WCO::RenderViewHostChanged). IN_PROC_BROWSER_TEST_F(ChromeSpeechRecognitionTest, BasicTearDown) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); - net::SpawnedTestServer::SSLOptions ssl_options; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, ssl_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(embedded_test_server()->Start()); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); GURL http_url = embedded_test_server()->GetURL("/speech/web_speech_test.html"); - GURL https_url(https_server.GetURL("files/speech/web_speech_test.html")); + GURL https_url(https_server.GetURL("/speech/web_speech_test.html")); scoped_ptr<ChromeSpeechRecognitionManagerDelegate> delegate( new ChromeSpeechRecognitionManagerDelegate()); diff --git a/chrome/browser/storage/durable_storage_browsertest.cc b/chrome/browser/storage/durable_storage_browsertest.cc index 3dc3e3a..fa8e826 100644 --- a/chrome/browser/storage/durable_storage_browsertest.cc +++ b/chrome/browser/storage/durable_storage_browsertest.cc @@ -66,7 +66,7 @@ void DurableStorageBrowserTest::SetUpCommandLine( void DurableStorageBrowserTest::SetUpOnMainThread() { if (embedded_test_server()->Started()) return; - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); url_ = embedded_test_server()->GetURL("/durable/durability-permissions.html"); } diff --git a/chrome/browser/supervised_user/supervised_user_browsertest.cc b/chrome/browser/supervised_user/supervised_user_browsertest.cc index 5398688..36721cb 100644 --- a/chrome/browser/supervised_user/supervised_user_browsertest.cc +++ b/chrome/browser/supervised_user/supervised_user_browsertest.cc @@ -34,6 +34,7 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gmock/include/gmock/gmock.h" using content::InterstitialPage; @@ -116,8 +117,8 @@ class SupervisedUserBlockModeTest : public InProcessBrowserTest { void SetUpCommandLine(base::CommandLine* command_line) override { // Enable the test server and remap all URLs to it. - ASSERT_TRUE(test_server()->Start()); - std::string host_port = test_server()->host_port_pair().ToString(); + ASSERT_TRUE(embedded_test_server()->Start()); + std::string host_port = embedded_test_server()->host_port_pair().ToString(); command_line->AppendSwitchASCII(switches::kHostResolverRules, "MAP *.example.com " + host_port + "," + "MAP *.new-example.com " + host_port + "," + @@ -175,7 +176,7 @@ class MockTabStripModelObserver : public TabStripModelObserver { // Navigates to a blocked URL. IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest, SendAccessRequestOnBlockedURL) { - GURL test_url("http://www.example.com/files/simple.html"); + GURL test_url("http://www.example.com/simple.html"); ui_test_utils::NavigateToURL(browser(), test_url); WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); @@ -201,7 +202,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest, OpenBlockedURLInNewTab) { WebContents* prev_tab = tab_strip->GetActiveWebContents(); // Open blocked URL in a new tab. - GURL test_url("http://www.example.com/files/simple.html"); + GURL test_url("http://www.example.com/simple.html"); ui_test_utils::NavigateToURLWithDisposition( browser(), test_url, NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); @@ -225,7 +226,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest, OpenBlockedURLInNewTab) { // Tests whether a visit attempt adds a special history entry. IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest, HistoryVisitRecorded) { - GURL allowed_url("http://www.example.com/files/simple.html"); + GURL allowed_url("http://www.example.com/simple.html"); scoped_refptr<SupervisedUserURLFilter> filter = supervised_user_service_->GetURLFilterForUIThread(); @@ -250,7 +251,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest, CheckShownPageIsNotInterstitial(tab); // Navigate to a blocked page and go back on the interstitial. - GURL blocked_url("http://www.new-example.com/files/simple.html"); + GURL blocked_url("http://www.new-example.com/simple.html"); ui_test_utils::NavigateToURL(browser(), blocked_url); tab = browser()->tab_strip_model()->GetActiveWebContents(); @@ -283,7 +284,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest, } IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest, Unblock) { - GURL test_url("http://www.example.com/files/simple.html"); + GURL test_url("http://www.example.com/simple.html"); ui_test_utils::NavigateToURL(browser(), test_url); WebContents* web_contents = diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index 0245fc6..f200924 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -77,7 +77,6 @@ #include "net/base/network_change_notifier.h" #include "net/base/port_util.h" #include "net/cookies/cookie_monster.h" -#include "net/test/spawned_test_server/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 332c7c9..d2ef0c1 100644 --- a/chrome/browser/tab_contents/view_source_browsertest.cc +++ b/chrome/browser/tab_contents/view_source_browsertest.cc @@ -21,7 +21,7 @@ namespace { const char kTestHtml[] = "/viewsource/test.html"; -const char kTestMedia[] = "files/media/pink_noise_140ms.wav"; +const char kTestMedia[] = "/media/pink_noise_140ms.wav"; } typedef InProcessBrowserTest ViewSourceTest; @@ -31,7 +31,7 @@ typedef InProcessBrowserTest ViewSourceTest; // page in view source). // Flaky; see http://crbug.com/72201. IN_PROC_BROWSER_TEST_F(ViewSourceTest, DoesBrowserRenderInViewSource) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // First we navigate to our view-source test page. GURL url(content::kViewSourceScheme + std::string(":") + @@ -49,7 +49,7 @@ IN_PROC_BROWSER_TEST_F(ViewSourceTest, DoesBrowserRenderInViewSource) { // implementation of the view-source: prefix being consumed (removed from the // URL) if the URL was not changed (apart from adding the view-source prefix) IN_PROC_BROWSER_TEST_F(ViewSourceTest, DoesBrowserConsumeViewSourcePrefix) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // First we navigate to google.html. GURL url(embedded_test_server()->GetURL(kTestHtml)); @@ -69,7 +69,7 @@ IN_PROC_BROWSER_TEST_F(ViewSourceTest, DoesBrowserConsumeViewSourcePrefix) { // Make sure that when looking at the actual page, we can select "View Source" // from the menu. IN_PROC_BROWSER_TEST_F(ViewSourceTest, ViewSourceInMenuEnabledOnANormalPage) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL url(embedded_test_server()->GetURL(kTestHtml)); ui_test_utils::NavigateToURL(browser(), url); @@ -80,9 +80,9 @@ IN_PROC_BROWSER_TEST_F(ViewSourceTest, ViewSourceInMenuEnabledOnANormalPage) { // For page that is media content, make sure that we cannot select "View Source" // See http://crbug.com/83714 IN_PROC_BROWSER_TEST_F(ViewSourceTest, ViewSourceInMenuDisabledOnAMediaPage) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); - GURL url(test_server()->GetURL(kTestMedia)); + GURL url(embedded_test_server()->GetURL(kTestMedia)); ui_test_utils::NavigateToURL(browser(), url); const char* mime_type = browser()->tab_strip_model()->GetActiveWebContents()-> @@ -96,7 +96,7 @@ IN_PROC_BROWSER_TEST_F(ViewSourceTest, ViewSourceInMenuDisabledOnAMediaPage) { // from the menu. IN_PROC_BROWSER_TEST_F(ViewSourceTest, ViewSourceInMenuDisabledWhileViewingSource) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL url_viewsource(content::kViewSourceScheme + std::string(":") + embedded_test_server()->GetURL(kTestHtml).spec()); @@ -109,7 +109,7 @@ IN_PROC_BROWSER_TEST_F(ViewSourceTest, // the page in view-source mode. // Times out on Mac, Windows, ChromeOS Linux: crbug.com/162080 IN_PROC_BROWSER_TEST_F(ViewSourceTest, DISABLED_TestViewSourceReload) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL url_viewsource(content::kViewSourceScheme + std::string(":") + embedded_test_server()->GetURL(kTestHtml).spec()); diff --git a/chrome/browser/task_management/providers/web_contents/devtools_tag_browsertest.cc b/chrome/browser/task_management/providers/web_contents/devtools_tag_browsertest.cc index c009d52..0a26496 100644 --- a/chrome/browser/task_management/providers/web_contents/devtools_tag_browsertest.cc +++ b/chrome/browser/task_management/providers/web_contents/devtools_tag_browsertest.cc @@ -9,13 +9,14 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" +#include "net/test/embedded_test_server/embedded_test_server.h" namespace task_management { namespace { -const char kTestPage1[] = "files/devtools/debugger_test_page.html"; -const char kTestPage2[] = "files/devtools/navigate_back.html"; +const char kTestPage1[] = "/devtools/debugger_test_page.html"; +const char kTestPage2[] = "/devtools/navigate_back.html"; } // namespace @@ -27,13 +28,13 @@ class DevToolsTagTest : public InProcessBrowserTest { public: DevToolsTagTest() : devtools_window_(nullptr) { - CHECK(test_server()->Start()); + CHECK(embedded_test_server()->Start()); } ~DevToolsTagTest() override {} void LoadTestPage(const std::string& test_page) { - GURL url = test_server()->GetURL(test_page); + GURL url = embedded_test_server()->GetURL(test_page); ui_test_utils::NavigateToURL(browser(), url); } diff --git a/chrome/browser/task_management/providers/web_contents/subframe_task_browsertest.cc b/chrome/browser/task_management/providers/web_contents/subframe_task_browsertest.cc index 53df079..e99a3f9 100644 --- a/chrome/browser/task_management/providers/web_contents/subframe_task_browsertest.cc +++ b/chrome/browser/task_management/providers/web_contents/subframe_task_browsertest.cc @@ -50,7 +50,7 @@ class SubframeTaskBrowserTest : public InProcessBrowserTest { void SetUpOnMainThread() override { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::SetupCrossSiteRedirector(embedded_test_server()); } diff --git a/chrome/browser/task_management/providers/web_contents/tab_contents_tag_browsertest.cc b/chrome/browser/task_management/providers/web_contents/tab_contents_tag_browsertest.cc index 6ff3bbf..796b2a6 100644 --- a/chrome/browser/task_management/providers/web_contents/tab_contents_tag_browsertest.cc +++ b/chrome/browser/task_management/providers/web_contents/tab_contents_tag_browsertest.cc @@ -109,9 +109,7 @@ class FaviconWaiter : public favicon::FaviconDriverObserver { // contents. class TabContentsTagTest : public InProcessBrowserTest { public: - TabContentsTagTest() { - EXPECT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); - } + TabContentsTagTest() { EXPECT_TRUE(embedded_test_server()->Start()); } ~TabContentsTagTest() override {} void AddNewTestTabAt(int index, const char* test_page_file) { diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index e0c8bda..d802188 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -234,7 +234,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, KillTab) { IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DISABLED_NavigateAwayFromHungRenderer) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ShowTaskManager(); ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); @@ -628,7 +628,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabChanges) { // The app under test acts on URLs whose host is "localhost", // so the URLs we navigate to must have host "localhost". host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL::Replacements replace_host; replace_host.SetHostStr("localhost"); GURL base_url = embedded_test_server()->GetURL( @@ -692,7 +692,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabAfterReload) { // The app under test acts on URLs whose host is "localhost", // so the URLs we navigate to must have host "localhost". host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL::Replacements replace_host; replace_host.SetHostStr("localhost"); GURL base_url = @@ -727,7 +727,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabBeforeReload) { // The app under test acts on URLs whose host is "localhost", // so the URLs we navigate to must have host "localhost". host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL::Replacements replace_host; replace_host.SetHostStr("localhost"); GURL base_url = @@ -930,7 +930,7 @@ IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, KillSubframe) { ShowTaskManager(); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::SetupCrossSiteRedirector(embedded_test_server()); GURL main_url(embedded_test_server()->GetURL( @@ -994,7 +994,7 @@ IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, ShowTaskManager(); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::SetupCrossSiteRedirector(embedded_test_server()); // Navigate the tab to a page on a.com with cross-process subframes to @@ -1045,7 +1045,7 @@ IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, ShowTaskManager(); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::SetupCrossSiteRedirector(embedded_test_server()); // Navigate to a page on b.com with a simple (same-site) iframe. @@ -1104,7 +1104,7 @@ IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, ShowTaskManager(); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::SetupCrossSiteRedirector(embedded_test_server()); // Navigate the tab to a page on a.com with cross-process subframes to @@ -1177,7 +1177,7 @@ IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, ShowTaskManager(); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); content::SetupCrossSiteRedirector(embedded_test_server()); // Navigate the tab to a page on a.com with cross-process subframes. diff --git a/chrome/browser/translate/translate_browsertest.cc b/chrome/browser/translate/translate_browsertest.cc index ff7ebba..6c4bbbd3 100644 --- a/chrome/browser/translate/translate_browsertest.cc +++ b/chrome/browser/translate/translate_browsertest.cc @@ -29,7 +29,6 @@ #include "content/public/test/browser_test_utils.h" #include "net/http/http_status_code.h" #include "net/test/embedded_test_server/embedded_test_server.h" -#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher_delegate.h" @@ -37,8 +36,6 @@ namespace { const base::FilePath::CharType kTranslateRoot[] = FILE_PATH_LITERAL("chrome/test/data/translate"); -const char kNonSecurePrefix[] = "translate/"; -const char kSecurePrefix[] = "files/"; const char kFrenchTestPath[] = "/fr_test.html"; const char kBasicFrenchTestPath[] = "/basic_fr_test.html"; const char kRefreshMetaTagTestPath[] = "/refresh_meta_tag.html"; @@ -66,12 +63,9 @@ class TranslateBaseBrowserTest : public InProcessBrowserTest { } void SetUpOnMainThread() override { - net::test_server::EmbeddedTestServer* test_server = embedded_test_server(); - base::FilePath test_data_dir; - PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir); - test_data_dir = test_data_dir.AppendASCII(kNonSecurePrefix); - test_server->ServeFilesFromDirectory(test_data_dir); - ASSERT_TRUE(test_server->InitializeAndWaitUntilReady()); + net::EmbeddedTestServer* test_server = embedded_test_server(); + test_server->ServeFilesFromSourceDirectory(kTranslateRoot); + ASSERT_TRUE(test_server->Start()); InProcessBrowserTest::SetUpOnMainThread(); } @@ -197,15 +191,15 @@ class TranslateBrowserTest : public TranslateBaseBrowserTest { class TranslateWithSecureServerBrowserTest : public TranslateBrowserTest { public: TranslateWithSecureServerBrowserTest() - : https_server_(net::SpawnedTestServer::TYPE_HTTPS, - SSLOptions(SSLOptions::CERT_OK), - base::FilePath(kTranslateRoot)) {} + : https_server_(net::EmbeddedTestServer::TYPE_HTTPS) { + https_server_.ServeFilesFromSourceDirectory(kTranslateRoot); + } void SetUpCommandLine(base::CommandLine* command_line) override { ASSERT_TRUE(https_server_.Start()); // Setup alternate security origin for testing in order to allow XHR against // local test server. Note that this flag shows a confirm infobar in tests. - GURL base_url = GetSecureURL(""); + GURL base_url = GetSecureURL("/"); command_line->AppendSwitchASCII( translate::switches::kTranslateSecurityOrigin, base_url.GetOrigin().spec()); @@ -214,14 +208,11 @@ class TranslateWithSecureServerBrowserTest : public TranslateBrowserTest { protected: GURL GetSecureURL(const std::string& path) const { - std::string prefix(kSecurePrefix); - return https_server_.GetURL(prefix + path); + return https_server_.GetURL(path); } private: - net::SpawnedTestServer https_server_; - - typedef net::SpawnedTestServer::SSLOptions SSLOptions; + net::EmbeddedTestServer https_server_; DISALLOW_COPY_AND_ASSIGN(TranslateWithSecureServerBrowserTest); }; diff --git a/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc b/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc index 73979b9..ff1529b 100644 --- a/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc +++ b/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc @@ -25,7 +25,6 @@ using content::BrowserThread; using net::test_server::BasicHttpResponse; using net::test_server::HttpRequest; using net::test_server::HttpResponse; -using net::test_server::EmbeddedTestServer; namespace app_list { namespace test { @@ -167,12 +166,10 @@ class PeopleProviderTest : public InProcessBrowserTest { // InProcessBrowserTest overrides: void SetUpOnMainThread() override { - test_server_.reset(new EmbeddedTestServer); - - ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady()); - test_server_->RegisterRequestHandler( + embedded_test_server()->RegisterRequestHandler( base::Bind(&PeopleProviderTest::HandleRequest, base::Unretained(this))); + ASSERT_TRUE(embedded_test_server()->Start()); people_provider_.reset(new PeopleProvider( ProfileManager::GetActiveUserProfile(), &test_controller_)); @@ -180,15 +177,10 @@ class PeopleProviderTest : public InProcessBrowserTest { people_provider_->SetupForTest( base::Bind(&PeopleProviderTest::OnSearchResultsFetched, base::Unretained(this)), - test_server_->base_url()); + embedded_test_server()->base_url()); people_provider_->set_use_throttling(false); } - void TearDownOnMainThread() override { - EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete()); - test_server_.reset(); - } - std::string RunQuery(const std::string& query, const std::string& mock_server_response) { people_provider_->Start(false, base::UTF8ToUTF16(query)); @@ -237,7 +229,6 @@ class PeopleProviderTest : public InProcessBrowserTest { run_loop_->Quit(); } - scoped_ptr<EmbeddedTestServer> test_server_; scoped_ptr<base::RunLoop> run_loop_; std::string mock_server_response_; diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc b/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc index e8160aa..4bb888a 100644 --- a/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc +++ b/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc @@ -28,7 +28,6 @@ using extensions::Manifest; using net::test_server::BasicHttpResponse; using net::test_server::HttpRequest; using net::test_server::HttpResponse; -using net::test_server::EmbeddedTestServer; namespace app_list { namespace test { @@ -135,14 +134,12 @@ class WebstoreProviderTest : public InProcessBrowserTest { // InProcessBrowserTest overrides: void SetUpOnMainThread() override { - test_server_.reset(new EmbeddedTestServer); - - ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady()); - test_server_->RegisterRequestHandler( + embedded_test_server()->RegisterRequestHandler( base::Bind(&WebstoreProviderTest::HandleRequest, base::Unretained(this))); + ASSERT_TRUE(embedded_test_server()->Start()); base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( - ::switches::kAppsGalleryURL, test_server_->base_url().spec()); + ::switches::kAppsGalleryURL, embedded_test_server()->base_url().spec()); base::CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalAppList); @@ -155,11 +152,6 @@ class WebstoreProviderTest : public InProcessBrowserTest { webstore_provider_->set_use_throttling(false); } - void TearDownOnMainThread() override { - EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete()); - test_server_.reset(); - } - void RunQuery(const std::string& query, const std::string& mock_server_response) { mock_server_response_ = mock_server_response; @@ -248,7 +240,6 @@ class WebstoreProviderTest : public InProcessBrowserTest { run_loop_->Quit(); } - scoped_ptr<EmbeddedTestServer> test_server_; scoped_ptr<base::RunLoop> run_loop_; std::string mock_server_response_; diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc index 85a93a2..384fed0 100644 --- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc @@ -13,6 +13,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "third_party/skia/include/core/SkBitmap.h" using content::WebContents; @@ -78,8 +79,9 @@ class LauncherFaviconLoaderBrowsertest protected: bool NavigateTo(const char* url) { - std::string url_path = base::StringPrintf("files/ash/launcher/%s", url); - ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(url_path)); + std::string url_path = base::StringPrintf("/ash/launcher/%s", url); + ui_test_utils::NavigateToURL(browser(), + embedded_test_server()->GetURL(url_path)); return true; } @@ -125,7 +127,7 @@ class LauncherFaviconLoaderBrowsertest }; IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, SmallLauncherIcon) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(NavigateTo("launcher-smallfavicon.html")); EXPECT_TRUE(WaitForContentsLoaded()); EXPECT_TRUE(WaitForFaviconUpdated()); @@ -135,7 +137,7 @@ IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, SmallLauncherIcon) { } IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, LargeLauncherIcon) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(NavigateTo("launcher-largefavicon.html")); EXPECT_TRUE(WaitForContentsLoaded()); EXPECT_TRUE(WaitForFaviconUpdated()); @@ -145,7 +147,7 @@ IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, LargeLauncherIcon) { } IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ManyLauncherIcons) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(NavigateTo("launcher-manyfavicon.html")); EXPECT_TRUE(WaitForContentsLoaded()); EXPECT_TRUE(WaitForFaviconUpdated()); @@ -158,7 +160,7 @@ IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ManyLauncherIcons) { } IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ChangeLauncherIcons) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(NavigateTo("launcher-manyfavicon.html")); EXPECT_TRUE(WaitForContentsLoaded()); EXPECT_TRUE(WaitForFaviconUpdated()); diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc index a1b58b1..3b0f010 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc @@ -56,7 +56,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" #include "google_apis/gaia/google_service_auth_error.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/web/WebInputEvent.h" @@ -394,9 +394,8 @@ class AutofillDialogControllerTest : public InProcessBrowserTest { // Loads an html page on a provided server, the causes it to launch rAc. // Returns whether rAc succesfully launched. - bool RunTestPage(const net::SpawnedTestServer& server) { - GURL url = server.GetURL( - "files/request_autocomplete/test_page.html"); + bool RunTestPage(const net::EmbeddedTestServer& server) { + GURL url = server.GetURL("/request_autocomplete/test_page.html"); ui_test_utils::NavigateToURL(browser(), url); // Pass through the broken SSL interstitial, if any. @@ -422,10 +421,9 @@ class AutofillDialogControllerTest : public InProcessBrowserTest { return !!controller; } - void RunTestPageInIframe(const net::SpawnedTestServer& server) { + void RunTestPageInIframe(const net::EmbeddedTestServer& server) { InitializeDOMMessageQueue(); - GURL iframe_url = server.GetURL( - "files/request_autocomplete/test_page.html"); + GURL iframe_url = server.GetURL("/request_autocomplete/test_page.html"); ui_test_utils::NavigateToURL( browser(), GURL(std::string("data:text/html,") + @@ -1082,10 +1080,8 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, DoesWorkOnHttpWithFlag) { - net::SpawnedTestServer http_server( - net::SpawnedTestServer::TYPE_HTTP, - net::SpawnedTestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer http_server; + http_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(http_server.Start()); EXPECT_TRUE(RunTestPage(http_server)); } @@ -1109,30 +1105,24 @@ class AutofillDialogControllerSecurityTest : IN_PROC_BROWSER_TEST_F(AutofillDialogControllerSecurityTest, DoesntWorkOnHttp) { - net::SpawnedTestServer http_server( - net::SpawnedTestServer::TYPE_HTTP, - net::SpawnedTestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer http_server; + http_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(http_server.Start()); EXPECT_FALSE(RunTestPage(http_server)); } IN_PROC_BROWSER_TEST_F(AutofillDialogControllerSecurityTest, DoesWorkOnHttpWithFlags) { - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, - SSLOptions(SSLOptions::CERT_OK), - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); EXPECT_TRUE(RunTestPage(https_server)); } IN_PROC_BROWSER_TEST_F(AutofillDialogControllerSecurityTest, DISABLED_DoesntWorkOnBrokenHttps) { - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, - SSLOptions(SSLOptions::CERT_EXPIRED), - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); EXPECT_FALSE(RunTestPage(https_server)); } @@ -1318,10 +1308,8 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, HideOnNavigate) { // Tests that the rAc dialog hides when the main frame is navigated, even if // it was invoked from a child frame. IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, HideOnNavigateMainFrame) { - net::SpawnedTestServer http_server( - net::SpawnedTestServer::TYPE_HTTP, - net::SpawnedTestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer http_server; + http_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(http_server.Start()); RunTestPageInIframe(http_server); @@ -1333,10 +1321,8 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, HideOnNavigateMainFrame) { // Tests that the rAc dialog hides when the iframe it's in is navigated. IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, HideOnNavigateIframe) { - net::SpawnedTestServer http_server( - net::SpawnedTestServer::TYPE_HTTP, - net::SpawnedTestServer::kLocalhost, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer http_server; + http_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(http_server.Start()); RunTestPageInIframe(http_server); diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc index 636a3cb..d516618 100644 --- a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc +++ b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc @@ -145,7 +145,7 @@ class PopupBlockerBrowserTest : public InProcessBrowserTest { InProcessBrowserTest::SetUpOnMainThread(); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); } int GetBlockedContentsCount() { diff --git a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc index f756be5..ca88e91 100644 --- a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc @@ -26,6 +26,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "net/test/embedded_test_server/embedded_test_server.h" using bookmarks::BookmarkModel; @@ -170,16 +171,14 @@ IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, DISABLED_MultiProfile) { IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, MAYBE_HideStarOnNonbookmarkedInterstitial) { // Start an HTTPS server with a certificate error. - net::SpawnedTestServer::SSLOptions https_options; - https_options.server_certificate = - net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; - net::SpawnedTestServer https_server( - net::SpawnedTestServer::TYPE_HTTPS, https_options, - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME); + https_server.ServeFilesFromSourceDirectory("chrome/test/data"); ASSERT_TRUE(https_server.Start()); + ASSERT_TRUE(embedded_test_server()->Start()); BookmarkModel* bookmark_model = WaitForBookmarkModel(browser()->profile()); - GURL bookmark_url = test_server()->GetURL("http://example.test"); + GURL bookmark_url = embedded_test_server()->GetURL("example.test", "/"); bookmarks::AddIfNotBookmarked(bookmark_model, bookmark_url, base::ASCIIToUTF16("Bookmark")); @@ -198,7 +197,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, // Now go to a non-bookmarked url which triggers an SSL warning. Bookmark // star should disappear. - GURL error_url = https_server.GetURL("."); + GURL error_url = https_server.GetURL("/"); ui_test_utils::NavigateToURL(browser(), error_url); web_contents = browser()->tab_strip_model()->GetActiveWebContents(); content::WaitForInterstitialAttach(web_contents); diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index e697346..0d5915e 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -12,6 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" +#include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "base/sys_info.h" #include "chrome/app/chrome_command_ids.h" @@ -100,6 +101,8 @@ #include "net/base/net_errors.h" #include "net/dns/mock_host_resolver.h" #include "net/ssl/ssl_connection_status_flags.h" +#include "net/test/embedded_test_server/embedded_test_server.h" +#include "net/test/embedded_test_server/request_handler_util.h" #include "net/test/spawned_test_server/spawned_test_server.h" #include "net/test/url_request/url_request_mock_http_job.h" #include "net/url_request/url_request_filter.h" @@ -342,14 +345,14 @@ void ProceedThroughInterstitial(content::WebContents* web_contents) { observer.Wait(); } -bool GetFilePathWithHostAndPortReplacement( +void GetFilePathWithHostAndPortReplacement( const std::string& original_file_path, const net::HostPortPair& host_port_pair, std::string* replacement_path) { - std::vector<net::SpawnedTestServer::StringPair> replacement_text; + base::StringPairs replacement_text; replacement_text.push_back( make_pair("REPLACE_WITH_HOST_AND_PORT", host_port_pair.ToString())); - return net::SpawnedTestServer::GetFilePathWithReplacements( + net::test_server::GetFilePathWithReplacements( original_file_path, replacement_text, replacement_path); } @@ -643,7 +646,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_ThirtyFourTabs) { // a pending entry if we start from the NTP but not from a normal page. // See http://crbug.com/355537. IN_PROC_BROWSER_TEST_F(BrowserTest, ClearPendingOnFailUnlessNTP) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); GURL ntp_url(search::GetNewTabPageURL(browser()->profile())); @@ -651,7 +654,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ClearPendingOnFailUnlessNTP) { // Navigate to a 204 URL (aborts with no content) on the NTP and make sure it // sticks around so that the user can edit it. - GURL abort_url(test_server()->GetURL("nocontent")); + GURL abort_url(embedded_test_server()->GetURL("/nocontent")); { content::WindowedNotificationObserver stop_observer( content::NOTIFICATION_LOAD_STOP, @@ -665,7 +668,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ClearPendingOnFailUnlessNTP) { } // Navigate to a real URL. - GURL real_url(test_server()->GetURL("title1.html")); + GURL real_url(embedded_test_server()->GetURL("/title1.html")); ui_test_utils::NavigateToURL(browser(), real_url); EXPECT_EQ(real_url, web_contents->GetVisibleURL()); @@ -687,9 +690,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ClearPendingOnFailUnlessNTP) { // cross-process navigation is ready to commit. // Flaky test, see https://crbug.com/445155. IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_CrossProcessNavCancelsDialogs) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); host_resolver()->AddRule("www.example.com", "127.0.0.1"); - GURL url(test_server()->GetURL("empty.html")); + GURL url(embedded_test_server()->GetURL("/empty.html")); ui_test_utils::NavigateToURL(browser(), url); // Test this with multiple alert dialogs to ensure that we can navigate away @@ -715,9 +718,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_CrossProcessNavCancelsDialogs) { // Make sure that dialogs are closed after a renderer process dies, and that // subsequent navigations work. See http://crbug/com/343265. IN_PROC_BROWSER_TEST_F(BrowserTest, SadTabCancelsDialogs) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); host_resolver()->AddRule("www.example.com", "127.0.0.1"); - GURL beforeunload_url(test_server()->GetURL("files/beforeunload.html")); + GURL beforeunload_url(embedded_test_server()->GetURL("/beforeunload.html")); ui_test_utils::NavigateToURL(browser(), beforeunload_url); // Start a navigation to trigger the beforeunload dialog. @@ -739,7 +742,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, SadTabCancelsDialogs) { EXPECT_FALSE(dialog_queue->HasActiveDialog()); // Make sure subsequent navigations work. - GURL url2("http://www.example.com/files/empty.html"); + GURL url2("http://www.example.com/empty.html"); ui_test_utils::NavigateToURL(browser(), url2); } @@ -774,8 +777,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, SadTabCancelsSubframeDialogs) { // page is showing. See crbug.com/482380. IN_PROC_BROWSER_TEST_F(BrowserTest, InterstitialCancelsGuestViewDialogs) { // Navigate to a PDF, which is loaded within a guestview. - ASSERT_TRUE(test_server()->Start()); - GURL pdf_with_dialog(test_server()->GetURL("files/alert_dialog.pdf")); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL pdf_with_dialog(embedded_test_server()->GetURL("/alert_dialog.pdf")); ui_test_utils::NavigateToURL(browser(), pdf_with_dialog); AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog(); @@ -850,10 +853,10 @@ class RedirectObserver : public content::WebContentsObserver { // http://crbug.com/243957. IN_PROC_BROWSER_TEST_F(BrowserTest, NoStopDuringTransferUntilCommit) { // Create HTTP and HTTPS servers for a cross-site transition. - ASSERT_TRUE(test_server()->Start()); - net::SpawnedTestServer https_test_server(net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::kLocalhost, - base::FilePath(kDocRoot)); + ASSERT_TRUE(embedded_test_server()->Start()); + net::EmbeddedTestServer https_test_server( + net::EmbeddedTestServer::TYPE_HTTPS); + https_test_server.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot)); ASSERT_TRUE(https_test_server.Start()); // Temporarily replace ContentBrowserClient with one that will cause a @@ -862,7 +865,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NoStopDuringTransferUntilCommit) { content::ContentBrowserClient* old_client = SetBrowserClientForTesting(&new_client); - GURL init_url(test_server()->GetURL("files/title1.html")); + GURL init_url(embedded_test_server()->GetURL("/title1.html")); ui_test_utils::NavigateToURL(browser(), init_url); // Navigate to a same-site page that redirects, causing a transfer. @@ -871,9 +874,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NoStopDuringTransferUntilCommit) { // Create a RedirectObserver that goes away before we close the tab. { RedirectObserver redirect_observer(contents); - GURL dest_url(https_test_server.GetURL("files/title2.html")); - GURL redirect_url(test_server()->GetURL("server-redirect?" + - dest_url.spec())); + GURL dest_url(https_test_server.GetURL("/title2.html")); + GURL redirect_url( + embedded_test_server()->GetURL("/server-redirect?" + dest_url.spec())); ui_test_utils::NavigateToURL(browser(), redirect_url); // We should immediately see the new committed entry. @@ -901,10 +904,10 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NoStopDuringTransferUntilCommit) { // handler to run once. IN_PROC_BROWSER_TEST_F(BrowserTest, SingleBeforeUnloadAfterRedirect) { // Create HTTP and HTTPS servers for a cross-site transition. - ASSERT_TRUE(test_server()->Start()); - net::SpawnedTestServer https_test_server(net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::kLocalhost, - base::FilePath(kDocRoot)); + ASSERT_TRUE(embedded_test_server()->Start()); + net::EmbeddedTestServer https_test_server( + net::EmbeddedTestServer::TYPE_HTTPS); + https_test_server.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot)); ASSERT_TRUE(https_test_server.Start()); // Temporarily replace ContentBrowserClient with one that will cause a @@ -914,7 +917,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, SingleBeforeUnloadAfterRedirect) { SetBrowserClientForTesting(&new_client); // Navigate to a page with a beforeunload handler. - GURL url(test_server()->GetURL("files/beforeunload.html")); + GURL url(embedded_test_server()->GetURL("/beforeunload.html")); ui_test_utils::NavigateToURL(browser(), url); // Navigate to a URL that redirects to another process and approve the @@ -922,9 +925,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, SingleBeforeUnloadAfterRedirect) { content::WindowedNotificationObserver nav_observer( content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::NotificationService::AllSources()); - GURL https_url(https_test_server.GetURL("files/title1.html")); - GURL redirect_url(test_server()->GetURL("server-redirect?" + - https_url.spec())); + GURL https_url(https_test_server.GetURL("/title1.html")); + GURL redirect_url( + embedded_test_server()->GetURL("/server-redirect?" + https_url.spec())); browser()->OpenURL(OpenURLParams(redirect_url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog(); @@ -945,8 +948,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CancelBeforeUnloadResetsURL) { ui_test_utils::NavigateToURL(browser(), url); // Navigate to a page that triggers a cross-site transition. - ASSERT_TRUE(test_server()->Start()); - GURL url2(test_server()->GetURL("files/title1.html")); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL url2(embedded_test_server()->GetURL("/title1.html")); browser()->OpenURL(OpenURLParams( url2, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); @@ -1125,13 +1128,13 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NullOpenerRedirectForksProcess) { switches::kDisablePopupBlocking); // Create http and https servers for a cross-site transition. - ASSERT_TRUE(test_server()->Start()); - net::SpawnedTestServer https_test_server(net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::kLocalhost, - base::FilePath(kDocRoot)); + ASSERT_TRUE(embedded_test_server()->Start()); + net::EmbeddedTestServer https_test_server( + net::EmbeddedTestServer::TYPE_HTTPS); + https_test_server.ServeFilesFromSourceDirectory(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())); + GURL http_url(embedded_test_server()->GetURL("/title1.html")); + GURL https_url(https_test_server.GetURL(std::string("/"))); // Start with an http URL. ui_test_utils::NavigateToURL(browser(), http_url); @@ -1214,13 +1217,13 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OtherRedirectsDontForkProcess) { switches::kDisablePopupBlocking); // Create http and https servers for a cross-site transition. - ASSERT_TRUE(test_server()->Start()); - net::SpawnedTestServer https_test_server(net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::kLocalhost, - base::FilePath(kDocRoot)); + ASSERT_TRUE(embedded_test_server()->Start()); + net::EmbeddedTestServer https_test_server( + net::EmbeddedTestServer::TYPE_HTTPS); + https_test_server.ServeFilesFromSourceDirectory(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())); + GURL http_url(embedded_test_server()->GetURL("/title1.html")); + GURL https_url(https_test_server.GetURL("/")); // Start with an http URL. ui_test_utils::NavigateToURL(browser(), http_url); @@ -1319,8 +1322,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttp) { CommandUpdater* command_updater = browser()->command_controller()->command_updater(); - ASSERT_TRUE(test_server()->Start()); - GURL http_url(test_server()->GetURL(std::string())); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL http_url(embedded_test_server()->GetURL("/")); ASSERT_TRUE(http_url.SchemeIs(url::kHttpScheme)); ui_test_utils::NavigateToURL(browser(), http_url); EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); @@ -1330,11 +1333,12 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttps) { CommandUpdater* command_updater = browser()->command_controller()->command_updater(); - 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("/")); + net::EmbeddedTestServer https_test_server( + net::EmbeddedTestServer::TYPE_HTTPS); + https_test_server.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot)); + ASSERT_TRUE(https_test_server.Start()); + + GURL https_url(https_test_server.GetURL("/")); ASSERT_TRUE(https_url.SchemeIs(url::kHttpsScheme)); ui_test_utils::NavigateToURL(browser(), https_url); EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); @@ -1375,8 +1379,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutInvalid) { // Change a tab into an application window. // DISABLED: http://crbug.com/72310 IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) { - ASSERT_TRUE(test_server()->Start()); - GURL http_url(test_server()->GetURL(std::string())); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL http_url(embedded_test_server()->GetURL("/")); ASSERT_TRUE(http_url.SchemeIs(url::kHttpScheme)); ASSERT_EQ(1, browser()->tab_strip_model()->count()); @@ -1428,9 +1432,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) { // to an anchor in javascript body.onload handler. IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_FaviconOfOnloadRedirectToAnchorPage) { - ASSERT_TRUE(test_server()->Start()); - GURL url(test_server()->GetURL("files/onload_redirect_to_anchor.html")); - GURL expected_favicon_url(test_server()->GetURL("files/test.png")); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL url(embedded_test_server()->GetURL("/onload_redirect_to_anchor.html")); + GURL expected_favicon_url(embedded_test_server()->GetURL("/test.png")); ui_test_utils::NavigateToURL(browser(), url); @@ -1473,9 +1477,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_FaviconChange) { // Makes sure TabClosing is sent when uninstalling an extension that is an app // tab. IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TabClosingWhenRemovingExtension) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); host_resolver()->AddRule("www.example.com", "127.0.0.1"); - GURL url(test_server()->GetURL("empty.html")); + GURL url(embedded_test_server()->GetURL("/empty.html")); TabStripModel* model = browser()->tab_strip_model(); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); @@ -1516,7 +1520,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TabClosingWhenRemovingExtension) { // Open with --app-id=<id>, and see that an application tab opens by default. IN_PROC_BROWSER_TEST_F(BrowserTest, AppIdSwitch) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // There should be one tab to start with. ASSERT_EQ(1, browser()->tab_strip_model()->count()); @@ -1556,7 +1560,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, AppIdSwitch) { // Open an app window and the dev tools window and ensure that the location // bar settings are correct. IN_PROC_BROWSER_TEST_F(BrowserTest, ShouldShowLocationBar) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Load an app. host_resolver()->AddRule("www.example.com", "127.0.0.1"); @@ -1609,11 +1613,11 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ShouldShowLocationBar) { #if !defined(OS_CHROMEOS) // Makes sure pinned tabs are restored correctly on start. IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Add a pinned tab. host_resolver()->AddRule("www.example.com", "127.0.0.1"); - GURL url(test_server()->GetURL("empty.html")); + GURL url(embedded_test_server()->GetURL("/empty.html")); TabStripModel* model = browser()->tab_strip_model(); ui_test_utils::NavigateToURL(browser(), url); model->SetTabPinned(0, true); @@ -1680,7 +1684,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CloseWithAppMenuOpen) { #if !defined(OS_MACOSX) IN_PROC_BROWSER_TEST_F(BrowserTest, OpenAppWindowLikeNtp) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Load an app host_resolver()->AddRule("www.example.com", "127.0.0.1"); @@ -2008,9 +2012,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_PageZoom) { } IN_PROC_BROWSER_TEST_F(BrowserTest, InterstitialCommandDisable) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); host_resolver()->AddRule("www.example.com", "127.0.0.1"); - GURL url(test_server()->GetURL("empty.html")); + GURL url(embedded_test_server()->GetURL("/empty.html")); ui_test_utils::NavigateToURL(browser(), url); CommandUpdater* command_updater = @@ -2051,9 +2055,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, InterstitialCommandDisable) { // Ensure that creating an interstitial page closes any JavaScript dialogs // that were present on the previous page. See http://crbug.com/295695. IN_PROC_BROWSER_TEST_F(BrowserTest, InterstitialClosesDialogs) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); host_resolver()->AddRule("www.example.com", "127.0.0.1"); - GURL url(test_server()->GetURL("empty.html")); + GURL url(embedded_test_server()->GetURL("/empty.html")); ui_test_utils::NavigateToURL(browser(), url); WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); @@ -2129,8 +2133,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, UserGesturesReported) { browser()->tab_strip_model()->GetActiveWebContents(); MockWebContentsObserver mock_observer(web_contents); - ASSERT_TRUE(test_server()->Start()); - GURL url(test_server()->GetURL("empty.html")); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL url(embedded_test_server()->GetURL("/empty.html")); ui_test_utils::NavigateToURL(browser(), url); EXPECT_TRUE(mock_observer.got_user_gesture()); @@ -2738,11 +2742,11 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, GetSizeForNewRenderView) { // visible_url=title1.html) browser()->profile()->GetPrefs()->SetBoolean(prefs::kWebKitJavascriptEnabled, false); - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Create an HTTPS server for cross-site transition. - net::SpawnedTestServer https_test_server(net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::kLocalhost, - base::FilePath(kDocRoot)); + net::EmbeddedTestServer https_test_server( + net::EmbeddedTestServer::TYPE_HTTPS); + https_test_server.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot)); ASSERT_TRUE(https_test_server.Start()); // Start with NTP. @@ -2759,7 +2763,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, GetSizeForNewRenderView) { // Navigate to a non-NTP page, without resizing WebContentsView. ui_test_utils::NavigateToURL(browser(), - test_server()->GetURL("files/title1.html")); + embedded_test_server()->GetURL("/title1.html")); ASSERT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state()); // A new RenderViewHost should be created. EXPECT_NE(prev_rvh, web_contents->GetRenderViewHost()); @@ -2797,7 +2801,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, GetSizeForNewRenderView) { // Navigate to another non-NTP page, without resizing WebContentsView. ui_test_utils::NavigateToURL(browser(), - https_test_server.GetURL("files/title2.html")); + https_test_server.GetURL("/title2.html")); ASSERT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state()); // A new RenderVieHost should be created. EXPECT_NE(prev_rvh, web_contents->GetRenderViewHost()); @@ -2817,7 +2821,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, GetSizeForNewRenderView) { gfx::Size wcv_resize_insets(1, 1); observer.set_wcv_resize_insets(wcv_resize_insets); ui_test_utils::NavigateToURL(browser(), - test_server()->GetURL("files/title2.html")); + embedded_test_server()->GetURL("/title2.html")); ASSERT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state()); gfx::Size rwhv_create_size2, rwhv_commit_size2, wcv_commit_size2; observer.GetSizeForRenderViewHost(web_contents->GetRenderViewHost(), @@ -2906,25 +2910,25 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CanDuplicateTab) { // Tests that the WebContentsObserver::SecurityStyleChanged event fires // with the current style on HTTP, broken HTTPS, and valid HTTPS pages. IN_PROC_BROWSER_TEST_F(BrowserTest, SecurityStyleChangedObserver) { - net::SpawnedTestServer https_test_server(net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::kLocalhost, - base::FilePath(kDocRoot)); - net::SpawnedTestServer https_test_server_expired( - net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::SSLOptions( - net::SpawnedTestServer::SSLOptions::CERT_EXPIRED), - base::FilePath(kDocRoot)); - + net::EmbeddedTestServer https_test_server( + net::EmbeddedTestServer::TYPE_HTTPS); + https_test_server.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot)); ASSERT_TRUE(https_test_server.Start()); + + net::EmbeddedTestServer https_test_server_expired( + net::EmbeddedTestServer::TYPE_HTTPS); + https_test_server_expired.SetSSLConfig(net::EmbeddedTestServer::CERT_EXPIRED); + https_test_server_expired.ServeFilesFromSourceDirectory( + base::FilePath(kDocRoot)); ASSERT_TRUE(https_test_server_expired.Start()); - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); SecurityStyleTestObserver observer(web_contents); // Visit an HTTP url. - GURL http_url(test_server()->GetURL(std::string())); + GURL http_url(embedded_test_server()->GetURL("/")); ui_test_utils::NavigateToURL(browser(), http_url); EXPECT_EQ(content::SECURITY_STYLE_UNAUTHENTICATED, observer.latest_security_style()); @@ -2937,9 +2941,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, SecurityStyleChangedObserver) { // Visit an (otherwise valid) HTTPS page that displays mixed content. std::string replacement_path; - ASSERT_TRUE(GetFilePathWithHostAndPortReplacement( - "files/ssl/page_displays_insecure_content.html", - test_server()->host_port_pair(), &replacement_path)); + GetFilePathWithHostAndPortReplacement( + "/ssl/page_displays_insecure_content.html", + embedded_test_server()->host_port_pair(), &replacement_path); GURL mixed_content_url(https_test_server.GetURL(replacement_path)); ui_test_utils::NavigateToURL(browser(), mixed_content_url); @@ -2961,7 +2965,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, SecurityStyleChangedObserver) { mixed_content_explanation.ran_insecure_content_style); // Visit a broken HTTPS url. - GURL expired_url(https_test_server_expired.GetURL(std::string())); + GURL expired_url(https_test_server_expired.GetURL(std::string("/"))); ui_test_utils::NavigateToURL(browser(), expired_url); // An interstitial should show, and an event for the lock icon on the @@ -2977,7 +2981,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, SecurityStyleChangedObserver) { // Before clicking through, navigate to a different page, and then go // back to the interstitial. - GURL valid_https_url(https_test_server.GetURL(std::string())); + GURL valid_https_url(https_test_server.GetURL(std::string("/"))); ui_test_utils::NavigateToURL(browser(), valid_https_url); EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATED, observer.latest_security_style()); @@ -3021,20 +3025,16 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, SecurityStyleChangedObserver) { // Visit a valid HTTPS page, then a broken HTTPS page, and then go back, // and test that the observed security style matches. IN_PROC_BROWSER_TEST_F(BrowserTest, SecurityStyleChangedObserverGoBack) { - net::SpawnedTestServer https_test_server(net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::kLocalhost, - base::FilePath(kDocRoot)); - - // Use a separate server to work around a mysterious SSL handshake - // timeout when both requests go to the same server. See - // https://crbug.com/515906. - net::SpawnedTestServer https_test_server_expired( - net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::SSLOptions( - net::SpawnedTestServer::SSLOptions::CERT_EXPIRED), - base::FilePath(kDocRoot)); - + net::EmbeddedTestServer https_test_server( + net::EmbeddedTestServer::TYPE_HTTPS); + https_test_server.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot)); ASSERT_TRUE(https_test_server.Start()); + + net::EmbeddedTestServer https_test_server_expired( + net::EmbeddedTestServer::TYPE_HTTPS); + https_test_server_expired.SetSSLConfig(net::EmbeddedTestServer::CERT_EXPIRED); + https_test_server_expired.ServeFilesFromSourceDirectory( + base::FilePath(kDocRoot)); ASSERT_TRUE(https_test_server_expired.Start()); content::WebContents* web_contents = @@ -3042,7 +3042,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, SecurityStyleChangedObserverGoBack) { SecurityStyleTestObserver observer(web_contents); // Visit a valid HTTPS url. - GURL valid_https_url(https_test_server.GetURL(std::string())); + GURL valid_https_url(https_test_server.GetURL(std::string("/"))); ui_test_utils::NavigateToURL(browser(), valid_https_url); EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATED, observer.latest_security_style()); @@ -3056,7 +3056,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, SecurityStyleChangedObserverGoBack) { // Navigate to a bad HTTPS page on a different host, and then click // Back to verify that the previous good security style is seen again. - GURL expired_https_url(https_test_server_expired.GetURL(std::string())); + GURL expired_https_url(https_test_server_expired.GetURL(std::string("/"))); host_resolver()->AddRule("www.example_broken.test", "127.0.0.1"); GURL::Replacements replace_host; replace_host.SetHostStr("www.example_broken.test"); diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc index 6be8ead..dd51bde 100644 --- a/chrome/browser/ui/browser_focus_uitest.cc +++ b/chrome/browser/ui/browser_focus_uitest.cc @@ -71,7 +71,7 @@ class BrowserFocusTest : public InProcessBrowserTest { public: // InProcessBrowserTest overrides: void SetUpOnMainThread() override { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); } bool IsViewFocused(ViewID vid) { diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc index ba50af6..bc2fc35 100644 --- a/chrome/browser/ui/browser_navigator_browsertest.cc +++ b/chrome/browser/ui/browser_navigator_browsertest.cc @@ -30,13 +30,14 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" +#include "net/test/embedded_test_server/embedded_test_server.h" using content::WebContents; namespace { const char kExpectedTitle[] = "PASSED!"; -const char kEchoTitleCommand[] = "echotitle"; +const char kEchoTitleCommand[] = "/echotitle"; GURL GetGoogleURL() { return GURL("http://www.google.com/"); @@ -1355,14 +1356,15 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, ViewSourceIsntSingleton) { IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, SendBrowserInitiatedRequestUsingPOST) { // Uses a test sever to verify POST request. - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Open a browser initiated POST request in new foreground tab. base::string16 expected_title(base::ASCIIToUTF16(kExpectedTitle)); std::string post_data = kExpectedTitle; base::string16 title; ASSERT_TRUE(OpenPOSTURLInNewForegroundTabAndGetTitle( - test_server()->GetURL(kEchoTitleCommand), post_data, true, &title)); + embedded_test_server()->GetURL(kEchoTitleCommand), post_data, true, + &title)); EXPECT_EQ(expected_title, title); } @@ -1371,14 +1373,15 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, SendRendererInitiatedRequestUsingPOST) { // Uses a test sever to verify POST request. - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Open a renderer initiated POST request in new foreground tab. base::string16 expected_title(base::ASCIIToUTF16(kExpectedTitle)); std::string post_data = kExpectedTitle; base::string16 title; ASSERT_TRUE(OpenPOSTURLInNewForegroundTabAndGetTitle( - test_server()->GetURL(kEchoTitleCommand), post_data, false, &title)); + embedded_test_server()->GetURL(kEchoTitleCommand), post_data, false, + &title)); EXPECT_NE(expected_title, title); } diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc index 4b8b84e..6303502 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc @@ -16,7 +16,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "components/content_settings/core/common/content_settings_types.h" #include "content/public/test/test_navigation_observer.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" const base::FilePath::CharType kDocRoot[] = @@ -26,11 +26,8 @@ class ContentSettingBubbleModelMixedScriptTest : public InProcessBrowserTest { protected: void SetUpInProcessBrowserTestFixture() override { https_server_.reset( - new net::SpawnedTestServer( - net::SpawnedTestServer::TYPE_HTTPS, - net::SpawnedTestServer::SSLOptions( - net::SpawnedTestServer::SSLOptions::CERT_OK), - base::FilePath(kDocRoot))); + new net::EmbeddedTestServer(net::EmbeddedTestServer::TYPE_HTTPS)); + https_server_->ServeFilesFromSourceDirectory(base::FilePath(kDocRoot)); ASSERT_TRUE(https_server_->Start()); } @@ -39,15 +36,14 @@ class ContentSettingBubbleModelMixedScriptTest : public InProcessBrowserTest { browser()->tab_strip_model()->GetActiveWebContents()); } - scoped_ptr<net::SpawnedTestServer> https_server_; + scoped_ptr<net::EmbeddedTestServer> https_server_; }; // Tests that a MIXEDSCRIPT type ContentSettingBubbleModel sends appropriate // IPCs to allow the renderer to load unsafe scripts and refresh the page // automatically. IN_PROC_BROWSER_TEST_F(ContentSettingBubbleModelMixedScriptTest, MainFrame) { - GURL url(https_server_->GetURL( - "files/content_setting_bubble/mixed_script.html")); + GURL url(https_server_->GetURL("/content_setting_bubble/mixed_script.html")); // Load a page with mixed content and do quick verification by looking at // the title string. @@ -79,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingBubbleModelMixedScriptTest, MainFrame) { // content shield isn't shown for it). IN_PROC_BROWSER_TEST_F(ContentSettingBubbleModelMixedScriptTest, Iframe) { GURL url(https_server_->GetURL( - "files/content_setting_bubble/mixed_script_in_iframe.html")); + "/content_setting_bubble/mixed_script_in_iframe.html")); ui_test_utils::NavigateToURL(browser(), url); diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.cc index 898a923..cd5679d 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.cc @@ -14,6 +14,7 @@ #include "components/content_settings/core/browser/host_content_settings_map.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" +#include "net/test/embedded_test_server/embedded_test_server.h" using content::WebContents; using ui::PAGE_TRANSITION_TYPED; @@ -95,8 +96,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, FullscreenOnFileURL) { } IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, PermissionContentSettings) { - GURL url = test_server()->GetURL(kFullscreenMouseLockHTML); - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL url = embedded_test_server()->GetURL(kFullscreenMouseLockHTML); ui_test_utils::NavigateToURL(browser(), url); EXPECT_FALSE(browser()->window()->IsFullscreen()); diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc index 868bb34..1f3ab90 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc @@ -19,6 +19,7 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" +#include "net/test/embedded_test_server/embedded_test_server.h" using url::kAboutBlankURL; using content::WebContents; @@ -26,7 +27,7 @@ using ui::PAGE_TRANSITION_TYPED; namespace { -const base::FilePath::CharType* kSimpleFile = FILE_PATH_LITERAL("simple.html"); +const base::FilePath::CharType* kSimpleFile = FILE_PATH_LITERAL("/simple.html"); } // namespace @@ -100,7 +101,7 @@ void FullscreenControllerInteractiveTest::ToggleBrowserFullscreen( // Tests Fullscreen and Mouse Lock with varying content settings ALLOW & BLOCK. void FullscreenControllerInteractiveTest::TestFullscreenMouseLockContentSettings() { - GURL url = test_server()->GetURL("simple.html"); + GURL url = embedded_test_server()->GetURL("/simple.html"); AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); // Validate that going fullscreen for a URL defaults to asking permision. @@ -185,7 +186,7 @@ void FullscreenControllerInteractiveTest::ToggleTabFullscreen_Internal( // Test is flaky: http://crbug.com/146006 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, DISABLED_TestNewTabExitsFullscreen) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); @@ -203,7 +204,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, // Test is flaky: http://crbug.com/146006 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, DISABLED_TestTabExitsItselfFromFullscreen) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); @@ -216,7 +217,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, // Test is flaky: http://crbug.com/146006 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, DISABLED_TestFullscreenBubbleMouseLockState) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); AddTabAtIndex(1, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); @@ -302,7 +303,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, // Test is flaky: http://crbug.com/146006 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, DISABLED_TestTabExitsFullscreenOnNavigation) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); @@ -315,7 +316,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, // Test is flaky: http://crbug.com/146006 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, DISABLED_TestTabExitsFullscreenOnGoBack) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); @@ -332,7 +333,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, IN_PROC_BROWSER_TEST_F( FullscreenControllerInteractiveTest, DISABLED_TestTabDoesntExitFullscreenOnSubFrameNavigation) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); GURL url(ui_test_utils::GetTestUrl(base::FilePath( base::FilePath::kCurrentDirectory), base::FilePath(kSimpleFile))); @@ -349,7 +350,7 @@ IN_PROC_BROWSER_TEST_F( IN_PROC_BROWSER_TEST_F( FullscreenControllerInteractiveTest, DISABLED_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab")); @@ -367,7 +368,7 @@ IN_PROC_BROWSER_TEST_F( // http://crbug.com/100467 IN_PROC_BROWSER_TEST_F( FullscreenControllerTest, DISABLED_TabEntersPresentationModeFromWindowed) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); @@ -405,9 +406,9 @@ IN_PROC_BROWSER_TEST_F( // Tests mouse lock can be escaped with ESC key. IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, EscapingMouseLock) { - ASSERT_TRUE(test_server()->Start()); - ui_test_utils::NavigateToURL(browser(), - test_server()->GetURL(kFullscreenMouseLockHTML)); + ASSERT_TRUE(embedded_test_server()->Start()); + ui_test_utils::NavigateToURL( + browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); ASSERT_FALSE(IsFullscreenBubbleDisplayed()); @@ -455,9 +456,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, EscapingMouseLock) { // Test is flaky: http://crbug.com/146006 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, DISABLED_EscapingMouseLockAndFullscreen) { - ASSERT_TRUE(test_server()->Start()); - ui_test_utils::NavigateToURL(browser(), - test_server()->GetURL(kFullscreenMouseLockHTML)); + ASSERT_TRUE(embedded_test_server()->Start()); + ui_test_utils::NavigateToURL( + browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); ASSERT_FALSE(IsFullscreenBubbleDisplayed()); @@ -517,9 +518,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, // Test is flaky: http://crbug.com/146006 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, DISABLED_MouseLockThenFullscreen) { - ASSERT_TRUE(test_server()->Start()); - ui_test_utils::NavigateToURL(browser(), - test_server()->GetURL(kFullscreenMouseLockHTML)); + ASSERT_TRUE(embedded_test_server()->Start()); + ui_test_utils::NavigateToURL( + browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); ASSERT_FALSE(IsFullscreenBubbleDisplayed()); @@ -574,9 +575,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, // Tests mouse lock then fullscreen in same request. IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, DISABLED_MouseLockAndFullscreen) { - ASSERT_TRUE(test_server()->Start()); - ui_test_utils::NavigateToURL(browser(), - test_server()->GetURL(kFullscreenMouseLockHTML)); + ASSERT_TRUE(embedded_test_server()->Start()); + ui_test_utils::NavigateToURL( + browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); ASSERT_FALSE(IsFullscreenBubbleDisplayed()); @@ -633,9 +634,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, // Test is flaky: http://crbug.com/146006 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, DISABLED_PrivilegedMouseLockAndFullscreen) { - ASSERT_TRUE(test_server()->Start()); - ui_test_utils::NavigateToURL(browser(), - test_server()->GetURL(kFullscreenMouseLockHTML)); + ASSERT_TRUE(embedded_test_server()->Start()); + ui_test_utils::NavigateToURL( + browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); ASSERT_FALSE(IsFullscreenBubbleDisplayed()); @@ -669,9 +670,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, // with no UI distraction for users. IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, MAYBE_MouseLockSilentAfterTargetUnlock) { - ASSERT_TRUE(test_server()->Start()); - ui_test_utils::NavigateToURL(browser(), - test_server()->GetURL(kFullscreenMouseLockHTML)); + ASSERT_TRUE(embedded_test_server()->Start()); + ui_test_utils::NavigateToURL( + browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); ASSERT_FALSE(IsFullscreenBubbleDisplayed()); @@ -756,9 +757,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, // Tests mouse lock is exited on page navigation. IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, MAYBE_TestTabExitsMouseLockOnNavigation) { - ASSERT_TRUE(test_server()->Start()); - ui_test_utils::NavigateToURL(browser(), - test_server()->GetURL(kFullscreenMouseLockHTML)); + ASSERT_TRUE(embedded_test_server()->Start()); + ui_test_utils::NavigateToURL( + browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); // Lock the mouse with a user gesture. ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( @@ -781,12 +782,12 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, // Tests mouse lock is exited when navigating back. IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, MAYBE_TestTabExitsMouseLockOnGoBack) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Navigate twice to provide a place to go back to. ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); - ui_test_utils::NavigateToURL(browser(), - test_server()->GetURL(kFullscreenMouseLockHTML)); + ui_test_utils::NavigateToURL( + browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); // Lock the mouse with a user gesture. ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait( @@ -816,10 +817,10 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, // Tests mouse lock is not exited on sub frame navigation. IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, MAYBE_TestTabDoesntExitMouseLockOnSubFrameNavigation) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Create URLs for test page and test page with #fragment. - GURL url(test_server()->GetURL(kFullscreenMouseLockHTML)); + GURL url(embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); GURL url_with_fragment(url.spec() + "#fragment"); // Navigate to test page. @@ -848,9 +849,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, // mac: http://crbug.com/103912 IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, DISABLED_ReloadExitsMouseLockAndFullscreen) { - ASSERT_TRUE(test_server()->Start()); - ui_test_utils::NavigateToURL(browser(), - test_server()->GetURL(kFullscreenMouseLockHTML)); + ASSERT_TRUE(embedded_test_server()->Start()); + ui_test_utils::NavigateToURL( + browser(), embedded_test_server()->GetURL(kFullscreenMouseLockHTML)); ASSERT_FALSE(IsMouseLockPermissionRequested()); @@ -924,7 +925,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, // TestFullscreenMouseLockContentSettings. // http://crbug.com/133831 - GURL url = test_server()->GetURL("simple.html"); + GURL url = embedded_test_server()->GetURL("/simple.html"); AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); // Validate that going fullscreen for a URL defaults to asking permision. diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc index 335892b..9683341 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc @@ -17,7 +17,7 @@ using content::WebContents; const char FullscreenControllerTest::kFullscreenMouseLockHTML[] = - "files/fullscreen_mouselock/fullscreen_mouselock.html"; + "/fullscreen_mouselock/fullscreen_mouselock.html"; void FullscreenControllerTest::RequestToLockMouse( bool user_gesture, diff --git a/chrome/browser/ui/find_bar/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/find_bar/find_bar_host_interactive_uitest.cc index 9b890cc..1c068d1 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_interactive_uitest.cc @@ -17,7 +17,6 @@ using base::WideToUTF16; using content::WebContents; -using net::test_server::EmbeddedTestServer; namespace { @@ -67,7 +66,7 @@ bool FocusedOnPage(WebContents* web_contents, std::string* result) { #define MAYBE_FindInPageEndState FindInPageEndState #endif IN_PROC_BROWSER_TEST_F(FindInPageInteractiveTest, MAYBE_FindInPageEndState) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Make sure Chrome is in the foreground, otherwise sending input // won't do anything and the test will hang. diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc index 44167e8..0ed5b73 100644 --- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc +++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc @@ -73,6 +73,7 @@ #include "content/public/test/test_utils.h" #include "net/base/network_change_notifier.h" #include "net/http/http_status_code.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher_impl.h" #include "net/url_request/url_request_status.h" @@ -145,10 +146,10 @@ class InstantExtendedTest : public InProcessBrowserTest, void SetUpInProcessBrowserTestFixture() override { search::EnableQueryExtractionForTesting(); ASSERT_TRUE(https_test_server().Start()); - GURL instant_url = https_test_server().GetURL( - "files/instant_extended.html?strk=1&"); - GURL ntp_url = https_test_server().GetURL( - "files/instant_extended_ntp.html?strk=1&"); + GURL instant_url = + https_test_server().GetURL("/instant_extended.html?strk=1&"); + GURL ntp_url = + https_test_server().GetURL("/instant_extended_ntp.html?strk=1&"); InstantTestBase::Init(instant_url, ntp_url, false); } @@ -257,10 +258,10 @@ class InstantExtendedPrefetchTest : public InstantExtendedTest { void SetUpInProcessBrowserTestFixture() override { search::EnableQueryExtractionForTesting(); ASSERT_TRUE(https_test_server().Start()); - GURL instant_url = https_test_server().GetURL( - "files/instant_extended.html?strk=1&"); - GURL ntp_url = https_test_server().GetURL( - "files/instant_extended_ntp.html?strk=1&"); + GURL instant_url = + https_test_server().GetURL("/instant_extended.html?strk=1&"); + GURL ntp_url = + https_test_server().GetURL("/instant_extended_ntp.html?strk=1&"); InstantTestBase::Init(instant_url, ntp_url, true); } @@ -315,10 +316,10 @@ class InstantPolicyTest : public ExtensionBrowserTest, public InstantTestBase { protected: void SetUpInProcessBrowserTestFixture() override { ASSERT_TRUE(https_test_server().Start()); - GURL instant_url = https_test_server().GetURL( - "files/instant_extended.html?strk=1&"); - GURL ntp_url = https_test_server().GetURL( - "files/instant_extended_ntp.html?strk=1&"); + GURL instant_url = + https_test_server().GetURL("/instant_extended.html?strk=1&"); + GURL ntp_url = + https_test_server().GetURL("/instant_extended_ntp.html?strk=1&"); InstantTestBase::Init(instant_url, ntp_url, false); } @@ -983,9 +984,9 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedTest, MAYBE_ShowURL) { // Check that clicking on a result sends the correct referrer. IN_PROC_BROWSER_TEST_F(InstantExtendedTest, Referrer) { - ASSERT_TRUE(test_server()->Start()); - GURL result_url = - test_server()->GetURL("files/referrer_policy/referrer-policy-log.html"); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL result_url = embedded_test_server()->GetURL( + "/referrer_policy/referrer-policy-log.html"); ASSERT_NO_FATAL_FAILURE(SetupInstant(browser())); FocusOmnibox(); diff --git a/chrome/browser/ui/search/instant_test_utils.cc b/chrome/browser/ui/search/instant_test_utils.cc index 56841fc..a6c5d5a 100644 --- a/chrome/browser/ui/search/instant_test_utils.cc +++ b/chrome/browser/ui/search/instant_test_utils.cc @@ -35,11 +35,9 @@ std::string WrapScript(const std::string& script) { // InstantTestBase ----------------------------------------------------------- InstantTestBase::InstantTestBase() - : https_test_server_( - net::SpawnedTestServer::TYPE_HTTPS, - net::BaseTestServer::SSLOptions(), - base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))), + : https_test_server_(net::EmbeddedTestServer::TYPE_HTTPS), init_suggestions_url_(false) { + https_test_server_.ServeFilesFromSourceDirectory("chrome/test/data"); } InstantTestBase::~InstantTestBase() {} diff --git a/chrome/browser/ui/search/instant_test_utils.h b/chrome/browser/ui/search/instant_test_utils.h index 1a63cc6..83c3327 100644 --- a/chrome/browser/ui/search/instant_test_utils.h +++ b/chrome/browser/ui/search/instant_test_utils.h @@ -18,7 +18,7 @@ #include "chrome/browser/ui/location_bar/location_bar.h" #include "chrome/browser/ui/search/instant_controller.h" #include "chrome/common/search_types.h" -#include "net/test/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" class BrowserInstantController; @@ -64,7 +64,7 @@ class InstantTestBase { const GURL& ntp_url() const { return ntp_url_; } - net::SpawnedTestServer& https_test_server() { return https_test_server_; } + net::EmbeddedTestServer& https_test_server() { return https_test_server_; } void KillInstantRenderView(); @@ -106,7 +106,7 @@ class InstantTestBase { Browser* browser_; // HTTPS Testing server, started on demand. - net::SpawnedTestServer https_test_server_; + net::EmbeddedTestServer https_test_server_; // Set to true to initialize suggestions URL in default search provider. bool init_suggestions_url_; diff --git a/chrome/browser/ui/search/local_ntp_browsertest.cc b/chrome/browser/ui/search/local_ntp_browsertest.cc index 78af6c4..8503162 100644 --- a/chrome/browser/ui/search/local_ntp_browsertest.cc +++ b/chrome/browser/ui/search/local_ntp_browsertest.cc @@ -13,6 +13,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "ui/base/resource/resource_bundle.h" class LocalNTPTest : public InProcessBrowserTest, @@ -23,10 +24,10 @@ class LocalNTPTest : public InProcessBrowserTest, protected: void SetUpInProcessBrowserTestFixture() override { ASSERT_TRUE(https_test_server().Start()); - GURL instant_url = https_test_server().GetURL( - "files/instant_extended.html?strk=1&"); - GURL ntp_url = https_test_server().GetURL( - "files/local_ntp_browsertest.html?strk=1&"); + GURL instant_url = + https_test_server().GetURL("/instant_extended.html?strk=1&"); + GURL ntp_url = + https_test_server().GetURL("/local_ntp_browsertest.html?strk=1&"); InstantTestBase::Init(instant_url, ntp_url, false); } }; diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc index 80e8032..4ab32fc 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc @@ -16,7 +16,6 @@ #include "net/test/embedded_test_server/http_response.h" using net::test_server::BasicHttpResponse; -using net::test_server::EmbeddedTestServer; using net::test_server::HttpRequest; using net::test_server::HttpResponse; @@ -89,7 +88,7 @@ class SearchEngineTabHelperBrowserTest : public InProcessBrowserTest { embedded_test_server()->RegisterRequestHandler( base::Bind(&SearchEngineTabHelperBrowserTest::HandleRequest, base::Unretained(this), file_url)); - return embedded_test_server()->InitializeAndWaitUntilReady(); + return embedded_test_server()->Start(); } void SetUpOnMainThread() override { ASSERT_TRUE(StartTestServer()); } diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc index 9fa9b52..e0fadee 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc @@ -46,6 +46,7 @@ #include "content/public/common/content_switches.h" #include "content/public/test/test_utils.h" #include "extensions/browser/extension_system.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" @@ -253,10 +254,10 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, OpenURLsPopup) { IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, StartupURLsOnNewWindowWithNoTabbedBrowsers) { // Use a couple same-site HTTP URLs. - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); std::vector<GURL> urls; - urls.push_back(test_server()->GetURL("files/title1.html")); - urls.push_back(test_server()->GetURL("files/title2.html")); + urls.push_back(embedded_test_server()->GetURL("/title1.html")); + urls.push_back(embedded_test_server()->GetURL("/title2.html")); Profile* profile = browser()->profile(); chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type(); @@ -527,9 +528,12 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, #define MAYBE_AddFirstRunTab AddFirstRunTab #endif IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, MAYBE_AddFirstRunTab) { + ASSERT_TRUE(embedded_test_server()->Start()); StartupBrowserCreator browser_creator; - browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html")); - browser_creator.AddFirstRunTab(test_server()->GetURL("files/title2.html")); + browser_creator.AddFirstRunTab( + embedded_test_server()->GetURL("/title1.html")); + browser_creator.AddFirstRunTab( + embedded_test_server()->GetURL("/title2.html")); // Do a simple non-process-startup browser launch. base::CommandLine dummy(base::CommandLine::NO_PROGRAM); @@ -560,10 +564,13 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, MAYBE_AddFirstRunTab) { #define MAYBE_AddCustomFirstRunTab AddCustomFirstRunTab #endif IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, MAYBE_AddCustomFirstRunTab) { + ASSERT_TRUE(embedded_test_server()->Start()); StartupBrowserCreator browser_creator; - browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html")); + browser_creator.AddFirstRunTab( + embedded_test_server()->GetURL("/title1.html")); browser_creator.AddFirstRunTab(GURL("http://new_tab_page")); - browser_creator.AddFirstRunTab(test_server()->GetURL("files/title2.html")); + browser_creator.AddFirstRunTab( + embedded_test_server()->GetURL("/title2.html")); browser_creator.AddFirstRunTab(GURL("http://welcome_page")); // Do a simple non-process-startup browser launch. @@ -660,8 +667,10 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, SyncPromoWithWelcomePage) { } IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, SyncPromoWithFirstRunTabs) { + ASSERT_TRUE(embedded_test_server()->Start()); StartupBrowserCreator browser_creator; - browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html")); + browser_creator.AddFirstRunTab( + embedded_test_server()->GetURL("/title1.html")); // The welcome page should not be shown, even if // first_run::ShouldShowWelcomePage() says so, when there are already @@ -697,8 +706,10 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, SyncPromoWithFirstRunTabs) { // tabs, but the welcome page was explcitly added to the first run tabs. IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, SyncPromoWithFirstRunTabsIncludingWelcomePage) { + ASSERT_TRUE(embedded_test_server()->Start()); StartupBrowserCreator browser_creator; - browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html")); + browser_creator.AddFirstRunTab( + embedded_test_server()->GetURL("/title1.html")); browser_creator.AddFirstRunTab(GURL("http://welcome_page")); // Do a simple non-process-startup browser launch. @@ -815,7 +826,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, PRE_UpdateWithTwoProfiles) { // Simulate a browser restart by creating the profiles in the PRE_ part. ProfileManager* profile_manager = g_browser_process->profile_manager(); - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Create two profiles. base::FilePath dest_path = profile_manager->user_data_dir(); @@ -834,7 +845,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, PRE_UpdateWithTwoProfiles) { browser()->host_desktop_type())); chrome::NewTab(browser1); ui_test_utils::NavigateToURL(browser1, - test_server()->GetURL("files/empty.html")); + embedded_test_server()->GetURL("/empty.html")); CloseBrowserSynchronously(browser1); Browser* browser2 = new Browser( @@ -842,7 +853,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, PRE_UpdateWithTwoProfiles) { browser()->host_desktop_type())); chrome::NewTab(browser2); ui_test_utils::NavigateToURL(browser2, - test_server()->GetURL("files/form.html")); + embedded_test_server()->GetURL("/form.html")); CloseBrowserSynchronously(browser2); // Set different startup preferences for the 2 profiles. @@ -921,8 +932,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ASSERT_TRUE(new_browser); TabStripModel* tab_strip = new_browser->tab_strip_model(); ASSERT_EQ(1, tab_strip->count()); - EXPECT_EQ("/files/empty.html", - tab_strip->GetWebContentsAt(0)->GetURL().path()); + EXPECT_EQ("/empty.html", tab_strip->GetWebContentsAt(0)->GetURL().path()); ASSERT_EQ(1u, chrome::GetBrowserCount(profile2, browser()->host_desktop_type())); @@ -930,8 +940,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ASSERT_TRUE(new_browser); tab_strip = new_browser->tab_strip_model(); ASSERT_EQ(1, tab_strip->count()); - EXPECT_EQ("/files/form.html", - tab_strip->GetWebContentsAt(0)->GetURL().path()); + EXPECT_EQ("/form.html", tab_strip->GetWebContentsAt(0)->GetURL().path()); } IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, @@ -942,6 +951,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, switches::kAshBrowserTests)) return; #endif + ASSERT_TRUE(embedded_test_server()->Start()); Profile* default_profile = browser()->profile(); @@ -990,7 +1000,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, browser()->host_desktop_type())); chrome::NewTab(browser_last); ui_test_utils::NavigateToURL(browser_last, - test_server()->GetURL("files/empty.html")); + embedded_test_server()->GetURL("/empty.html")); CloseBrowserAsynchronously(browser_last); // Close the main browser. @@ -1053,8 +1063,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ASSERT_TRUE(new_browser); tab_strip = new_browser->tab_strip_model(); ASSERT_EQ(1, tab_strip->count()); - EXPECT_EQ("/files/empty.html", - tab_strip->GetWebContentsAt(0)->GetURL().path()); + EXPECT_EQ("/empty.html", tab_strip->GetWebContentsAt(0)->GetURL().path()); // profile_home2 was not launched since it would've only opened the home page. ASSERT_EQ(0u, chrome::GetBrowserCount(profile_home2, original_desktop_type)); @@ -1417,14 +1426,16 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest, // Simulate the following master_preferences: // { // "first_run_tabs" : [ - // "files/title1.html" + // "/title1.html" // ], // "sync_promo": { // "show_on_first_run_allowed": true // } // } + ASSERT_TRUE(embedded_test_server()->Start()); StartupBrowserCreator browser_creator; - browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html")); + browser_creator.AddFirstRunTab( + embedded_test_server()->GetURL("/title1.html")); browser()->profile()->GetPrefs()->SetBoolean( prefs::kSignInPromoShowOnFirstRunAllowed, true); @@ -1462,16 +1473,17 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest, // Simulate the following master_preferences: // { // "first_run_tabs" : [ - // "files/title1.html", + // "/title1.html", // "chrome://signin/?source=0&next_page=chrome%3A%2F%2Fnewtab%2F" // ], // "sync_promo": { // "show_on_first_run_allowed": true // } // } - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); StartupBrowserCreator browser_creator; - browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html")); + browser_creator.AddFirstRunTab( + embedded_test_server()->GetURL("/title1.html")); browser_creator.AddFirstRunTab( signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false)); browser()->profile()->GetPrefs()->SetBoolean( @@ -1514,15 +1526,17 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest, // { // "first_run_tabs" : [ // "new_tab_page", - // "files/title1.html" + // "/title1.html" // ], // "sync_promo": { // "show_on_first_run_allowed": true // } // } + ASSERT_TRUE(embedded_test_server()->Start()); StartupBrowserCreator browser_creator; browser_creator.AddFirstRunTab(GURL("http://new_tab_page")); - browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html")); + browser_creator.AddFirstRunTab( + embedded_test_server()->GetURL("/title1.html")); browser()->profile()->GetPrefs()->SetBoolean( prefs::kSignInPromoShowOnFirstRunAllowed, true); @@ -1563,15 +1577,17 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest, // { // "first_run_tabs" : [ // "new_tab_page", - // "files/title1.html" + // "/title1.html" // ], // "sync_promo": { // "show_on_first_run_allowed": false // } // } + ASSERT_TRUE(embedded_test_server()->Start()); StartupBrowserCreator browser_creator; browser_creator.AddFirstRunTab(GURL("http://new_tab_page")); - browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html")); + browser_creator.AddFirstRunTab( + embedded_test_server()->GetURL("/title1.html")); browser()->profile()->GetPrefs()->SetBoolean( prefs::kSignInPromoShowOnFirstRunAllowed, false); @@ -1610,14 +1626,16 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest, // Simulate the following master_preferences: // { // "first_run_tabs" : [ - // "files/title1.html" + // "/title1.html" // ], // "sync_promo": { // "show_on_first_run_allowed": false // } // } + ASSERT_TRUE(embedded_test_server()->Start()); StartupBrowserCreator browser_creator; - browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html")); + browser_creator.AddFirstRunTab( + embedded_test_server()->GetURL("/title1.html")); browser()->profile()->GetPrefs()->SetBoolean( prefs::kSignInPromoShowOnFirstRunAllowed, false); @@ -1658,13 +1676,14 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest, // "show_on_first_run_allowed": true // } // } + ASSERT_TRUE(embedded_test_server()->Start()); StartupBrowserCreator browser_creator; browser()->profile()->GetPrefs()->SetBoolean( prefs::kSignInPromoShowOnFirstRunAllowed, true); // Set the following user policies: // * RestoreOnStartup = RestoreOnStartupIsURLs - // * RestoreOnStartupURLs = [ "files/title1.html" ] + // * RestoreOnStartupURLs = [ "/title1.html" ] policy_map_.Set( policy::key::kRestoreOnStartup, policy::POLICY_LEVEL_MANDATORY, @@ -1673,8 +1692,8 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest, new base::FundamentalValue(SessionStartupPref::kPrefValueURLs), NULL); base::ListValue startup_urls; - startup_urls.Append( - new base::StringValue(test_server()->GetURL("files/title1.html").spec())); + startup_urls.Append(new base::StringValue( + embedded_test_server()->GetURL("/title1.html").spec())); policy_map_.Set(policy::key::kRestoreOnStartupURLs, policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, startup_urls.DeepCopy(), diff --git a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc index c92e8b0..49ada97 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc @@ -20,6 +20,7 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -87,10 +88,10 @@ class StartupBrowserCreatorTriggeredResetTest : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest, TestTriggeredReset) { // Use a couple same-site HTTP URLs. - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); std::vector<GURL> urls; - urls.push_back(test_server()->GetURL("files/title1.html")); - urls.push_back(test_server()->GetURL("files/title2.html")); + urls.push_back(embedded_test_server()->GetURL("/title1.html")); + urls.push_back(embedded_test_server()->GetURL("/title2.html")); Profile* profile = browser()->profile(); chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type(); @@ -137,9 +138,11 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest, // The presence of First Run tabs (in production code, these commonly come // from master_preferences) should suppress the reset UI. Check that this is // the case. + ASSERT_TRUE(embedded_test_server()->Start()); StartupBrowserCreator browser_creator; browser_creator.AddFirstRunTab(GURL("http://new_tab_page")); - browser_creator.AddFirstRunTab(test_server()->GetURL("files/title1.html")); + browser_creator.AddFirstRunTab( + embedded_test_server()->GetURL("/title1.html")); // Do a process-startup browser launch. base::CommandLine dummy(base::CommandLine::NO_PROGRAM); diff --git a/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc b/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc index b9e8399..71c57a3 100644 --- a/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc +++ b/chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc @@ -22,6 +22,7 @@ #include "components/omnibox/browser/omnibox_view.h" #include "content/public/browser/browser_accessibility_state.h" #include "net/dns/mock_host_resolver.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/test/ui_controls.h" #include "url/gurl.h" @@ -208,8 +209,8 @@ IN_PROC_BROWSER_TEST_F(NavigationAccessibilityTest, chrome::ExecuteCommand(browser(), IDC_FOCUS_LOCATION); host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(test_server()->Start()); - GURL main_url(test_server()->GetURL("files/english_page.html")); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL main_url(embedded_test_server()->GetURL("/english_page.html")); OmniboxViewViews* omnibox_view = BrowserView::GetBrowserViewForBrowser(browser())-> diff --git a/chrome/browser/ui/views/collected_cookies_views_browsertest.cc b/chrome/browser/ui/views/collected_cookies_views_browsertest.cc index 5ae8780..e0c723f 100644 --- a/chrome/browser/ui/views/collected_cookies_views_browsertest.cc +++ b/chrome/browser/ui/views/collected_cookies_views_browsertest.cc @@ -15,7 +15,7 @@ class CollectedCookiesViewsTest : public InProcessBrowserTest { public: void SetUpOnMainThread() override { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // Disable cookies. CookieSettingsFactory::GetForProfile(browser()->profile()) diff --git a/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc b/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc index 871ff72..ab2a0ee 100644 --- a/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc +++ b/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc @@ -15,6 +15,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "extensions/common/manifest_constants.h" #include "extensions/test/result_catcher.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "ui/events/event_utils.h" typedef ExtensionApiTest BookmarkOverrideTest; @@ -32,7 +33,7 @@ const char kBookmarkKeybinding[] = "Ctrl+D"; // requests to override ctrl-D and the user has assigned it to an extension. // Flaky on all platforms: https://crbug.com/448956. IN_PROC_BROWSER_TEST_F(BookmarkOverrideTest, DISABLED_NonOverrideStarClick) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunExtensionTest("keybinding/basics")) << message_; const extensions::Extension* extension = GetSingleLoadedExtension(); @@ -70,7 +71,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkOverrideTest, DISABLED_NonOverrideStarClick) { // the user has assigned it to an extension. // Flaky on all platforms: https://crbug.com/448956. IN_PROC_BROWSER_TEST_F(BookmarkOverrideTest, DISABLED_NonOverrideBookmarkPage) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(RunExtensionTest("keybinding/basics")) << message_; const extensions::Extension* extension = GetSingleLoadedExtension(); diff --git a/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc index d7d23b3..e332836 100644 --- a/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc @@ -19,7 +19,7 @@ #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/spawned_test_server/spawned_test_server.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "ui/base/clipboard/clipboard.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/views/focus/focus_manager.h" @@ -30,7 +30,7 @@ using content::WebContents; namespace { -static const char kSimplePage[] = "files/find_in_page/simple.html"; +static const char kSimplePage[] = "/find_in_page/simple.html"; class FindInPageTest : public InProcessBrowserTest { public: @@ -57,10 +57,10 @@ class FindInPageTest : public InProcessBrowserTest { // Flaky because the test server fails to start? See: http://crbug.com/96594. IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // First we navigate to our test page (tab A). - GURL url = test_server()->GetURL(kSimplePage); + GURL url = embedded_test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); chrome::Find(browser()); @@ -91,12 +91,13 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) { } IN_PROC_BROWSER_TEST_F(FindInPageTest, NavigationByKeyEvent) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Make sure Chrome is in the foreground, otherwise sending input // won't do anything and the test will hang. ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); // First we navigate to any page. - ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(kSimplePage)); + ui_test_utils::NavigateToURL(browser(), + embedded_test_server()->GetURL(kSimplePage)); // Show the Find bar. browser()->GetFindBarController()->Show(); EXPECT_TRUE( @@ -136,9 +137,9 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, NavigationByKeyEvent) { // Flaky because the test server fails to start? See: http://crbug.com/96594. IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_FocusRestore) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); - GURL url = test_server()->GetURL("title1.html"); + GURL url = embedded_test_server()->GetURL("/title1.html"); ui_test_utils::NavigateToURL(browser(), url); // Focus the location bar, open and close the find-in-page, focus should @@ -187,14 +188,14 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_FocusRestore) { // interactive_ui_tests. // http://crbug.com/311363 IN_PROC_BROWSER_TEST_F(FindInPageTest, DISABLED_SelectionRestoreOnTabSwitch) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Make sure Chrome is in the foreground, otherwise sending input // won't do anything and the test will hang. ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); // First we navigate to any page in the current tab (tab A). - GURL url = test_server()->GetURL(kSimplePage); + GURL url = embedded_test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); // Show the Find bar. @@ -266,10 +267,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, DISABLED_SelectionRestoreOnTabSwitch) { // Flaky because the test server fails to start? See: http://crbug.com/96594. IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_FocusRestoreOnTabSwitch) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // First we navigate to our test page (tab A). - GURL url = test_server()->GetURL(kSimplePage); + GURL url = embedded_test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); chrome::Find(browser()); @@ -322,14 +323,14 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_FocusRestoreOnTabSwitch) { // it respects that and doesn't show you the last search, as reported in bug: // http://crbug.com/40121. For Aura see bug http://crbug.com/292299. IN_PROC_BROWSER_TEST_F(FindInPageTest, PrepopulateRespectBlank) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Make sure Chrome is in the foreground, otherwise sending input // won't do anything and the test will hang. ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); // First we navigate to any page. - GURL url = test_server()->GetURL(kSimplePage); + GURL url = embedded_test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); // Show the Find bar. @@ -384,14 +385,14 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, PrepopulateRespectBlank) { #endif IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_PasteWithoutTextChange) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); // Make sure Chrome is in the foreground, otherwise sending input // won't do anything and the test will hang. ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); // First we navigate to any page. - GURL url = test_server()->GetURL(kSimplePage); + GURL url = embedded_test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); // Show the Find bar. diff --git a/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc b/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc index 3d0aaf8..3f5418e 100644 --- a/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc +++ b/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc @@ -30,7 +30,7 @@ class BrowserViewFocusTest : public InProcessBrowserTest { // Flaky, http://crbug.com/69034. IN_PROC_BROWSER_TEST_F(BrowserViewFocusTest, DISABLED_BrowsersRememberFocus) { ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); // First we navigate to our test page. GURL url = embedded_test_server()->GetURL(kSimplePage); diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager_browsertest.cc b/chrome/browser/ui/website_settings/permission_bubble_manager_browsertest.cc index 503c7dc..eab27b2 100644 --- a/chrome/browser/ui/website_settings/permission_bubble_manager_browsertest.cc +++ b/chrome/browser/ui/website_settings/permission_bubble_manager_browsertest.cc @@ -52,7 +52,7 @@ class PermissionBubbleManagerBrowserTest : public InProcessBrowserTest { #endif IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, MAYBE_RequestsBeforeLoad) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( browser(), @@ -67,7 +67,7 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, // Requests before the load should not be bundled with a request after the load. IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, RequestsBeforeAfterLoad) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( browser(), @@ -89,7 +89,7 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, #define MAYBE_NavTwice NavTwice #endif IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, MAYBE_NavTwice) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( browser(), @@ -117,7 +117,7 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, MAYBE_NavTwice) { #endif IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, MAYBE_NavTwiceWithHash) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( browser(), @@ -138,7 +138,7 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, // Bubble requests should be shown after in-page navigation. IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, InPageNavigation) { - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( browser(), diff --git a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc index 7c8dcf5..1e0b1f1 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc @@ -17,6 +17,7 @@ #include "content/public/test/mock_download_item.h" #include "content/public/test/mock_download_manager.h" #include "content/public/test/test_utils.h" +#include "net/test/embedded_test_server/embedded_test_server.h" namespace { @@ -129,7 +130,7 @@ class DownloadsDOMHandlerTest : public InProcessBrowserTest { browser()->profile()->GetPrefs()->SetFilePath( prefs::kDownloadDefaultDirectory, downloads_directory_.path()); - CHECK(test_server()->Start()); + CHECK(embedded_test_server()->Start()); mock_handler_->HandleGetDownloads(nullptr); } @@ -138,7 +139,7 @@ class DownloadsDOMHandlerTest : public InProcessBrowserTest { } void DownloadAnItem() { - GURL url = test_server()->GetURL("files/downloads/image.jpg"); + GURL url = embedded_test_server()->GetURL("/downloads/image.jpg"); std::vector<GURL> url_chain; url_chain.push_back(url); base::Time current(base::Time::Now()); diff --git a/chrome/browser/ui/webui/inspect_ui_browsertest.cc b/chrome/browser/ui/webui/inspect_ui_browsertest.cc index a54b340..60458d4 100644 --- a/chrome/browser/ui/webui/inspect_ui_browsertest.cc +++ b/chrome/browser/ui/webui/inspect_ui_browsertest.cc @@ -13,15 +13,14 @@ #include "content/public/browser/navigation_details.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "net/test/embedded_test_server/embedded_test_server.h" using content::WebContents; namespace { -const char kSharedWorkerTestPage[] = - "files/workers/workers_ui_shared_worker.html"; -const char kSharedWorkerJs[] = - "files/workers/workers_ui_shared_worker.js"; +const char kSharedWorkerTestPage[] = "/workers/workers_ui_shared_worker.html"; +const char kSharedWorkerJs[] = "/workers/workers_ui_shared_worker.js"; class InspectUITest : public WebUIBrowserTest { public: @@ -46,8 +45,8 @@ IN_PROC_BROWSER_TEST_F(InspectUITest, InspectUIPage) { } IN_PROC_BROWSER_TEST_F(InspectUITest, SharedWorker) { - ASSERT_TRUE(test_server()->Start()); - GURL url = test_server()->GetURL(kSharedWorkerTestPage); + ASSERT_TRUE(embedded_test_server()->Start()); + GURL url = embedded_test_server()->GetURL(kSharedWorkerTestPage); ui_test_utils::NavigateToURL(browser(), url); ui_test_utils::NavigateToURLWithDisposition( @@ -86,7 +85,7 @@ IN_PROC_BROWSER_TEST_F(InspectUITest, AndroidTargets) { } IN_PROC_BROWSER_TEST_F(InspectUITest, ReloadCrash) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL)); ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL)); } diff --git a/chrome/browser/ui/webui/webui_webview_browsertest.cc b/chrome/browser/ui/webui/webui_webview_browsertest.cc index 1bb2e9e..2ed4fa8 100644 --- a/chrome/browser/ui/webui/webui_webview_browsertest.cc +++ b/chrome/browser/ui/webui/webui_webview_browsertest.cc @@ -29,7 +29,7 @@ class WebUIWebViewBrowserTest : public WebUIBrowserTest { base::FilePath test_data_dir; PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir); embedded_test_server()->ServeFilesFromDirectory(test_data_dir); - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); + ASSERT_TRUE(embedded_test_server()->Start()); } GURL GetTestUrl(const std::string& path) const { diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc index 3a368cd..ec7d76d 100644 --- a/chrome/browser/unload_browsertest.cc +++ b/chrome/browser/unload_browsertest.cc @@ -25,6 +25,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/url_request/url_request_mock_http_job.h" #include "net/url_request/url_request_test_util.h" @@ -429,14 +430,12 @@ class FastUnloadTest : public UnloadTest { } void SetUpInProcessBrowserTestFixture() override { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->Start()); } - void TearDownInProcessBrowserTestFixture() override { test_server()->Stop(); } - GURL GetUrl(const std::string& name) { - return GURL(test_server()->GetURL( - "files/fast_tab_close/" + name + ".html")); + return GURL( + embedded_test_server()->GetURL("/fast_tab_close/" + name + ".html")); } void NavigateToPage(const char* name) { diff --git a/chrome/test/data/extensions/api_test/webnavigation/prerender/test_prerender.js b/chrome/test/data/extensions/api_test/webnavigation/prerender/test_prerender.js index 4a7e092..b4d2d0e 100644 --- a/chrome/test/data/extensions/api_test/webnavigation/prerender/test_prerender.js +++ b/chrome/test/data/extensions/api_test/webnavigation/prerender/test_prerender.js @@ -5,14 +5,14 @@ onload = function() { var getURL = chrome.extension.getURL; var URL_LOAD = - "http://127.0.0.1:PORT/files/prerender/prerender_loader.html"; + "http://127.0.0.1:PORT/prerender/prerender_loader.html"; var URL_TARGET = - "http://127.0.0.1:PORT/files/prerender/prerender_page.html"; + "http://127.0.0.1:PORT/prerender/prerender_page.html"; chrome.tabs.create({"url": "about:blank"}, function(tab) { var tabId = tab.id; chrome.test.getConfig(function(config) { var fixPort = function(url) { - return url.replace(/PORT/g, config.spawnedTestServer.port); + return url.replace(/PORT/g, config.testServer.port); }; URL_LOAD = fixPort(URL_LOAD); URL_TARGET = fixPort(URL_TARGET); diff --git a/chrome/test/data/extensions/api_test/webstore_private/noframe2.html b/chrome/test/data/extensions/api_test/webstore_private/noframe2.html index 073d0b7c..f89deea 100644 --- a/chrome/test/data/extensions/api_test/webstore_private/noframe2.html +++ b/chrome/test/data/extensions/api_test/webstore_private/noframe2.html @@ -13,7 +13,7 @@ function dropFrame() { // an x-frame-options header for the error page. var f = document.createElement('iframe'); s = s.replace('127.0.0.1', 'www.example.com'); - s = s.replace('/files/', '/nonesuch/'); + s = s.replace('/extensions/', '/nonesuch/extensions/'); f.src = s; f.onload = checkFrame; f.onerror = checkFrame; diff --git a/chrome/test/data/extensions/native_client_hosted_app/manifest.json b/chrome/test/data/extensions/native_client_hosted_app/manifest.json index c1b4f54..73cf16b 100644 --- a/chrome/test/data/extensions/native_client_hosted_app/manifest.json +++ b/chrome/test/data/extensions/native_client_hosted_app/manifest.json @@ -5,10 +5,10 @@ "description": "end-to-end browser test for native client in hosted apps", "app": { "urls": [ - "http://localhost/files/extensions/native_client" + "http://localhost/extensions/native_client" ], "launch": { - "web_url": "http://localhost/files/extensions/native_client/test.html" + "web_url": "http://localhost/extensions/native_client/test.html" } } } diff --git a/chrome/test/data/extensions/platform_apps/web_view/interstitial_teardown/embedder.js b/chrome/test/data/extensions/platform_apps/web_view/interstitial_teardown/embedder.js index 979044a..4965030 100644 --- a/chrome/test/data/extensions/platform_apps/web_view/interstitial_teardown/embedder.js +++ b/chrome/test/data/extensions/platform_apps/web_view/interstitial_teardown/embedder.js @@ -8,7 +8,7 @@ window.loadGuest = function(port) { // This page is not loaded, we just need a https URL. var guestSrcHTTPS = 'https://localhost:' + port + - '/files/extensions/platform_apps/web_view/' + + '/extensions/platform_apps/web_view/' + 'interstitial_teardown/https_page.html'; window.console.log('guestSrcHTTPS: ' + guestSrcHTTPS); webview.setAttribute('src', guestSrcHTTPS); diff --git a/chrome/test/data/prerender/prerender_deferred_image.html b/chrome/test/data/prerender/prerender_deferred_image.html index 2507bf3..bcd8e60 100644 --- a/chrome/test/data/prerender/prerender_deferred_image.html +++ b/chrome/test/data/prerender/prerender_deferred_image.html @@ -15,7 +15,7 @@ if (location.hash == "#double_redirect") // Insert a deferred redirect into the document. var image = new Image(); -image.src = prefix + "/files/prerender/image-deferred.png"; +image.src = prefix + "/prerender/image-deferred.png"; image.onload = function() { imageWasLoaded = true; }; @@ -35,7 +35,7 @@ function DidDisplayPass() { // TODO(davidben): Wait on something more reasonable. This should // still pass reliably, but will only fail flakily on regression. var image2 = new Image(); -image2.src = prefix + "/files/prerender/image-redirect.png"; +image2.src = prefix + "/prerender/image-redirect.png"; image2.onload = function() { document.title = "READY"; }; diff --git a/chrome/test/data/redirect-loop.html.mock-http-headers b/chrome/test/data/redirect-loop.html.mock-http-headers index e23c257..f30c5e4 100644 --- a/chrome/test/data/redirect-loop.html.mock-http-headers +++ b/chrome/test/data/redirect-loop.html.mock-http-headers @@ -1,3 +1,3 @@ HTTP/1.1 302 Moved -Location: /files/redirect-loop.html +Location: /redirect-loop.html Set-Cookie: A=B diff --git a/extensions/common/api/test.json b/extensions/common/api/test.json index f4e193f..55809fd 100644 --- a/extensions/common/api/test.json +++ b/extensions/common/api/test.json @@ -39,20 +39,7 @@ "testServer": { "type": "object", "optional": true, - "description": "Details on the test server used to mock network responses. Will be set only if test calls ExtensionApiTest::StartTestServer().", - "properties": { - "port": { - "type": "integer", - "description": "The port on which the test server is listening.", - "minimum": 1024, - "maximum": 65535 - } - } - }, - "spawnedTestServer": { - "type": "object", - "optional": true, - "description": "Details on the spawned test server used to mock network responses. Will be set only if test calls ExtensionApiTest::StartSpawnedTestServer().", + "description": "Details on the test server used to mock network responses. Will be set only if test calls ExtensionApiTest::StartEmbeddedTestServer().", "properties": { "port": { "type": "integer", |