diff options
Diffstat (limited to 'chrome/browser')
49 files changed, 612 insertions, 843 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 19d82d7..dbc3b6e 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -52,7 +52,7 @@ const std::wstring OPEN_NEW_BEFOREUNLOAD_PAGE = const FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html"); const FilePath::CharType* kTitle2File = FILE_PATH_LITERAL("title2.html"); -const wchar_t kDocRoot[] = L"chrome/test/data"; +const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); // Given a page title, returns the expected window caption string. std::wstring WindowCaptionFromPageTitle(std::wstring page_title) { @@ -102,10 +102,9 @@ class BrowserTest : public ExtensionBrowserTest { // Used by phantom tab tests. Creates two tabs, pins the first and makes it // a phantom tab (by closing it). void PhantomTabTest() { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); host_resolver()->AddRule("www.example.com", "127.0.0.1"); - GURL url(server->TestServerPage("empty.html")); + GURL url(test_server()->GetURL("empty.html")); TabStripModel* model = browser()->tabstrip_model(); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); @@ -332,10 +331,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFile) { IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttp) { CommandUpdater* command_updater = browser()->command_updater(); - scoped_refptr<net::HTTPTestServer> http_server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != http_server.get()); - GURL http_url(http_server->TestServerPage("")); + ASSERT_TRUE(test_server()->Start()); + GURL http_url(test_server()->GetURL("")); ASSERT_TRUE(http_url.SchemeIs(chrome::kHttpScheme)); ui_test_utils::NavigateToURL(browser(), http_url); EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); @@ -344,10 +341,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttp) { IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttps) { CommandUpdater* command_updater = browser()->command_updater(); - scoped_refptr<net::HTTPSTestServer> https_server( - net::HTTPSTestServer::CreateGoodServer(kDocRoot)); - ASSERT_TRUE(NULL != https_server.get()); - GURL https_url(https_server->TestServerPage("/")); + net::TestServer test_server(net::TestServer::TYPE_HTTPS, FilePath(kDocRoot)); + ASSERT_TRUE(test_server.Start()); + GURL https_url(test_server.GetURL("/")); ASSERT_TRUE(https_url.SchemeIs(chrome::kHttpsScheme)); ui_test_utils::NavigateToURL(browser(), https_url); EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); @@ -356,10 +352,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttps) { IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFtp) { CommandUpdater* command_updater = browser()->command_updater(); - scoped_refptr<net::FTPTestServer> ftp_server( - net::FTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != ftp_server.get()); - GURL ftp_url(ftp_server->TestServerPage("")); + net::TestServer test_server(net::TestServer::TYPE_FTP, FilePath(kDocRoot)); + ASSERT_TRUE(test_server.Start()); + GURL ftp_url(test_server.GetURL("")); ASSERT_TRUE(ftp_url.SchemeIs(chrome::kFtpScheme)); ui_test_utils::NavigateToURL(browser(), ftp_url); EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); @@ -390,12 +385,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutInvalid) { // Test RenderView correctly send back favicon url for web page that redirects // to an anchor in javascript body.onload handler. IN_PROC_BROWSER_TEST_F(BrowserTest, FaviconOfOnloadRedirectToAnchorPage) { - static const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); - GURL url(server->TestServerPage("files/onload_redirect_to_anchor.html")); - GURL expected_favicon_url(server->TestServerPage("files/test.png")); + 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")); ui_test_utils::NavigateToURL(browser(), url); @@ -455,10 +447,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RevivePhantomTab) { // Makes sure TabClosing is sent when uninstalling an extension that is an app // tab. IN_PROC_BROWSER_TEST_F(BrowserTest, TabClosingWhenRemovingExtension) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); host_resolver()->AddRule("www.example.com", "127.0.0.1"); - GURL url(server->TestServerPage("empty.html")); + GURL url(test_server()->GetURL("empty.html")); TabStripModel* model = browser()->tabstrip_model(); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); @@ -511,10 +502,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, AppTabRemovedWhenExtensionUninstalled) { #endif // Tests that the CLD (Compact Language Detection) works properly. IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_PageLanguageDetection) { - static const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server()->Start()); TabContents* current_tab = browser()->GetSelectedTabContents(); @@ -524,7 +512,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_PageLanguageDetection) { en_language_detected_signal(NotificationType::TAB_LANGUAGE_DETERMINED, current_tab); ui_test_utils::NavigateToURL( - browser(), GURL(server->TestServerPage("files/english_page.html"))); + browser(), GURL(test_server()->GetURL("files/english_page.html"))); EXPECT_TRUE(current_tab->language_state().original_language().empty()); en_language_detected_signal.Wait(); std::string lang; @@ -538,7 +526,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_PageLanguageDetection) { fr_language_detected_signal(NotificationType::TAB_LANGUAGE_DETERMINED, current_tab); ui_test_utils::NavigateToURL( - browser(), GURL(server->TestServerPage("files/french_page.html"))); + browser(), GURL(test_server()->GetURL("files/french_page.html"))); EXPECT_TRUE(current_tab->language_state().original_language().empty()); fr_language_detected_signal.Wait(); lang.clear(); @@ -556,12 +544,11 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_PageLanguageDetection) { #endif // Makes sure pinned tabs are restored correctly on start. IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // Add an pinned app tab. host_resolver()->AddRule("www.example.com", "127.0.0.1"); - GURL url(server->TestServerPage("empty.html")); + GURL url(test_server()->GetURL("empty.html")); TabStripModel* model = browser()->tabstrip_model(); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); Extension* extension_app = GetExtension(); @@ -621,9 +608,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { class BrowserAppRefocusTest : public ExtensionBrowserTest { public: - BrowserAppRefocusTest(): server_(NULL), - extension_app_(NULL), - profile_(NULL) {} + BrowserAppRefocusTest() + : extension_app_(NULL), + profile_(NULL) {} protected: // Common setup for all tests. Can't use SetUpInProcessBrowserTestFixture @@ -632,8 +619,7 @@ class BrowserAppRefocusTest : public ExtensionBrowserTest { virtual void SetUpExtensionApp() { // The web URL of the example app we load has a host of // www.example.com . - server_ = StartHTTPServer(); - ASSERT_TRUE(server_); + ASSERT_TRUE(test_server()->Start()); host_resolver()->AddRule("www.example.com", "127.0.0.1"); profile_ = browser()->profile(); @@ -667,7 +653,6 @@ class BrowserAppRefocusTest : public ExtensionBrowserTest { return true; } - net::HTTPTestServer* server_; Extension* extension_app_; Profile* profile_; }; diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index 84a2ba8..6f2e0ad 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -187,11 +187,10 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, ClickingMovesFocus) { IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BrowsersRememberFocus) { BringBrowserWindowToFront(); - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our test page. - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); gfx::NativeWindow window = browser()->window()->GetNativeHandle(); @@ -252,11 +251,10 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BrowsersRememberFocus) { // Tabs remember focus. IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabsRememberFocus) { BringBrowserWindowToFront(); - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our test page. - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); // Create several tabs. @@ -331,11 +329,10 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabsRememberFocus) { // Tabs remember focus with find-in-page box. IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_TabsRememberFocusFindInPage) { BringBrowserWindowToFront(); - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our test page. - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); browser()->Find(); @@ -374,11 +371,10 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_TabsRememberFocusFindInPage) { // Background window does not steal focus. IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) { BringBrowserWindowToFront(); - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our test page. - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); // Open a new browser window. @@ -410,7 +406,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) { unfocused_browser = browser(); #endif - GURL steal_focus_url = server->TestServerPage(kStealFocusPage); + GURL steal_focus_url = test_server()->GetURL(kStealFocusPage); ui_test_utils::NavigateToURL(unfocused_browser, steal_focus_url); // Activate the first browser. @@ -431,11 +427,10 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) { // Page cannot steal focus when focus is on location bar. IN_PROC_BROWSER_TEST_F(BrowserFocusTest, LocationBarLockFocus) { BringBrowserWindowToFront(); - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // Open the page that steals focus. - GURL url = server->TestServerPage(kStealFocusPage); + GURL url = test_server()->GetURL(kStealFocusPage); ui_test_utils::NavigateToURL(browser(), url); browser()->FocusLocationBar(); @@ -454,11 +449,10 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, LocationBarLockFocus) { // RenderWidget::didFocus()). IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) { BringBrowserWindowToFront(); - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our test page. - GURL url = server->TestServerPage(kTypicalPage); + GURL url = test_server()->GetURL(kTypicalPage); ui_test_utils::NavigateToURL(browser(), url); browser()->FocusLocationBar(); @@ -548,11 +542,10 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) { // Focus traversal while an interstitial is showing. IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) { BringBrowserWindowToFront(); - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our test page. - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); // Focus should be on the page. @@ -640,11 +633,10 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) { // Focus stays on page with interstitials. IN_PROC_BROWSER_TEST_F(BrowserFocusTest, InterstitialFocus) { BringBrowserWindowToFront(); - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our test page. - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); // Page should have focus. @@ -677,11 +669,10 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, InterstitialFocus) { // Make sure Find box can request focus, even when it is already open. IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) { BringBrowserWindowToFront(); - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // Open some page (any page that doesn't steal focus). - GURL url = server->TestServerPage(kTypicalPage); + GURL url = test_server()->GetURL(kTypicalPage); ui_test_utils::NavigateToURL(browser(), url); gfx::NativeWindow window = browser()->window()->GetNativeHandle(); @@ -779,8 +770,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FLAKY_TabInitialFocus) { // Tests that focus goes where expected when using reload. IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) { BringBrowserWindowToFront(); - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // Open the new tab, reload. browser()->NewTab(); @@ -792,7 +782,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) { ASSERT_TRUE(IsViewFocused(VIEW_ID_LOCATION_BAR)); // Open a regular page, focus the location bar, reload. - ui_test_utils::NavigateToURL(browser(), server->TestServerPage(kSimplePage)); + ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(kSimplePage)); browser()->FocusLocationBar(); ASSERT_TRUE(IsViewFocused(VIEW_ID_LOCATION_BAR)); browser()->Reload(CURRENT_TAB); @@ -814,11 +804,10 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) { // Tests that focus goes where expected when using reload on a crashed tab. IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusOnReloadCrashedTab) { BringBrowserWindowToFront(); - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // Open a regular page, crash, reload. - ui_test_utils::NavigateToURL(browser(), server->TestServerPage(kSimplePage)); + ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(kSimplePage)); ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); browser()->Reload(CURRENT_TAB); ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser())); diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index 0c4bd37db..89f8c08 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -374,11 +374,10 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, NormalKeyEvents) { "U 65 0 false false false false" } }, }; - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); BringBrowserWindowToFront(); - GURL url = server->TestServerPage(kTestingPage); + GURL url = test_server()->GetURL(kTestingPage); ui_test_utils::NavigateToURL(browser(), url); ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER)); @@ -460,11 +459,10 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, CtrlKeyEvents) { "U 17 0 true false false false" } }; - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); BringBrowserWindowToFront(); - GURL url = server->TestServerPage(kTestingPage); + GURL url = test_server()->GetURL(kTestingPage); ui_test_utils::NavigateToURL(browser(), url); ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER)); @@ -506,11 +504,10 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, CommandKeyEvents) { "U 91 0 false false false true" } }; - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); BringBrowserWindowToFront(); - GURL url = server->TestServerPage(kTestingPage); + GURL url = test_server()->GetURL(kTestingPage); ui_test_utils::NavigateToURL(browser(), url); ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER)); @@ -603,11 +600,10 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, AccessKeys) { }; #endif - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); BringBrowserWindowToFront(); - GURL url = server->TestServerPage(kTestingPage); + GURL url = test_server()->GetURL(kTestingPage); ui_test_utils::NavigateToURL(browser(), url); ui_test_utils::RunAllPendingInMessageLoop(); @@ -671,11 +667,10 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, AccessKeys) { #endif IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_ReservedAccelerators) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); BringBrowserWindowToFront(); - GURL url = server->TestServerPage(kTestingPage); + GURL url = test_server()->GetURL(kTestingPage); ui_test_utils::NavigateToURL(browser(), url); ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER)); @@ -829,11 +824,10 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, EditorKeyBindings) { "U 17 0 true false false false" } }; - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); BringBrowserWindowToFront(); - GURL url = server->TestServerPage(kTestingPage); + GURL url = test_server()->GetURL(kTestingPage); ui_test_utils::NavigateToURL(browser(), url); ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER)); @@ -867,11 +861,10 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, PageUpDownKeys) { "U 34 0 false false false false" } }; - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); BringBrowserWindowToFront(); - GURL url = server->TestServerPage(kTestingPage); + GURL url = test_server()->GetURL(kTestingPage); ui_test_utils::NavigateToURL(browser(), url); ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER)); @@ -909,11 +902,10 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, FocusMenuBarByAltKey) { "U 17 0 true false false false" } }; - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); BringBrowserWindowToFront(); - GURL url = server->TestServerPage(kTestingPage); + GURL url = test_server()->GetURL(kTestingPage); ui_test_utils::NavigateToURL(browser(), url); ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER)); diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc index 3140ad0..8ec30a2 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/browser_uitest.cc @@ -87,9 +87,10 @@ TEST_F(BrowserTest, NullOpenerRedirectForksProcess) { if (in_process_renderer()) return; - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); + FilePath test_file(test_data_directory_); scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0)); ASSERT_TRUE(window.get()); @@ -137,10 +138,10 @@ TEST_F(BrowserTest, MAYBE_OtherRedirectsDontForkProcess) { if (in_process_renderer()) return; - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); + FilePath test_file(test_data_directory_); scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0)); ASSERT_TRUE(window.get()); diff --git a/chrome/browser/chrome_plugin_unittest.cc b/chrome/browser/chrome_plugin_unittest.cc index 09c73a0..3c5495c 100644 --- a/chrome/browser/chrome_plugin_unittest.cc +++ b/chrome/browser/chrome_plugin_unittest.cc @@ -22,7 +22,7 @@ namespace { -const wchar_t kDocRoot[] = L"chrome/test/data"; +const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); const char kPluginFilename[] = "test_chrome_plugin.dll"; const int kResponseBufferSize = 4096; @@ -279,11 +279,10 @@ TEST_F(ChromePluginTest, CanMakeGETRequestAsync) { // Tests that the plugin can issue a POST request. TEST_F(ChromePluginTest, CanMakePOSTRequest) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + ASSERT_TRUE(test_server.Start()); - GURL url = server->TestServerPage("echo"); + GURL url = test_server.GetURL("echo"); EXPECT_EQ(CPERR_SUCCESS, test_funcs_.test_make_request("POST", url)); diff --git a/chrome/browser/collected_cookies_uitest.cc b/chrome/browser/collected_cookies_uitest.cc index e59d36d..92b97b0 100644 --- a/chrome/browser/collected_cookies_uitest.cc +++ b/chrome/browser/collected_cookies_uitest.cc @@ -15,7 +15,7 @@ namespace { -const wchar_t kDocRoot[] = L"chrome/test/data"; +const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); } // namespace @@ -23,9 +23,9 @@ typedef UITest CollectedCookiesTest; // Test is flaky. http://crbug.com/49539 TEST_F(CollectedCookiesTest, FLAKY_DoubleDisplay) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + ASSERT_TRUE(test_server.Start()); + scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); @@ -37,7 +37,7 @@ TEST_F(CollectedCookiesTest, FLAKY_DoubleDisplay) { CONTENT_SETTING_BLOCK)); // Load a page with cookies. - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("files/cookie1.html"))); + ASSERT_TRUE(tab->NavigateToURL(test_server.GetURL("files/cookie1.html"))); // Click on the info link twice. ASSERT_TRUE(tab->ShowCollectedCookiesDialog()); @@ -46,9 +46,9 @@ TEST_F(CollectedCookiesTest, FLAKY_DoubleDisplay) { // Test is flaky. http://crbug.com/49539 TEST_F(CollectedCookiesTest, FLAKY_NavigateAway) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + ASSERT_TRUE(test_server.Start()); + scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); @@ -60,11 +60,11 @@ TEST_F(CollectedCookiesTest, FLAKY_NavigateAway) { CONTENT_SETTING_BLOCK)); // Load a page with cookies. - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("files/cookie1.html"))); + ASSERT_TRUE(tab->NavigateToURL(test_server.GetURL("files/cookie1.html"))); // Click on the info link. ASSERT_TRUE(tab->ShowCollectedCookiesDialog()); // Navigate to another page. - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("files/cookie2.html"))); + ASSERT_TRUE(tab->NavigateToURL(test_server.GetURL("files/cookie2.html"))); } diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index 46ad42f..2b92090 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -111,8 +111,8 @@ class DevToolsSanityTest : public InProcessBrowserTest { } void OpenDevToolsWindow(const std::string& test_page) { - net::HTTPTestServer* server = StartHTTPServer(); - GURL url = server->TestServerPage(test_page); + ASSERT_TRUE(test_server()->Start()); + GURL url = test_server()->GetURL(test_page); ui_test_utils::NavigateToURL(browser(), url); inspected_rvh_ = GetInspectedTab()->render_view_host(); diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc index 705dc14..6446b56 100644 --- a/chrome/browser/errorpage_uitest.cc +++ b/chrome/browser/errorpage_uitest.cc @@ -168,12 +168,10 @@ TEST_F(ErrorPageTest, IFrame404) { // In this test, the iframe sets the title of the parent page to "SUCCESS" // when the iframe loads. If the iframe fails to load (because an alternate // error page loads instead), then the title will remain as "FAIL". - scoped_refptr<net::HTTPTestServer> server = - net::HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); - GURL test_url = server->TestServerPage("files/iframe404.html"); - NavigateToURL(test_url); - + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); + NavigateToURL(test_server.GetURL("files/iframe404.html")); EXPECT_TRUE(WaitForTitleMatching(L"SUCCESS")); } diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc index af4e967..a75fc50 100644 --- a/chrome/browser/extensions/app_background_page_apitest.cc +++ b/chrome/browser/extensions/app_background_page_apitest.cc @@ -18,7 +18,7 @@ class AppBackgroundPageApiTest : public ExtensionApiTest { IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, Basic) { host_resolver()->AddRule("a.com", "127.0.0.1"); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); LoadExtension(test_data_dir_.AppendASCII( "app_background_page/app_has_permission")); @@ -27,7 +27,7 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, Basic) { IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, LacksPermission) { host_resolver()->AddRule("a.com", "127.0.0.1"); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); LoadExtension(test_data_dir_.AppendASCII( "app_background_page/app_lacks_permission")); diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index aa3fad1..4a0014b 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -56,7 +56,7 @@ static void NavigateTabHelper(TabContents* contents, const GURL& url) { IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app_process"))); diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc index 63d205b..82f1320 100644 --- a/chrome/browser/extensions/browser_action_apitest.cc +++ b/chrome/browser/extensions/browser_action_apitest.cc @@ -45,7 +45,7 @@ class BrowserActionApiTest : public ExtensionApiTest { }; IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("browser_action/basics")) << message_; Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; @@ -266,7 +266,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionRemovePopup) { } IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoBasic) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("browser_action/basics")) << message_; Extension* extension = GetSingleLoadedExtension(); diff --git a/chrome/browser/extensions/content_script_all_frames_apitest.cc b/chrome/browser/extensions/content_script_all_frames_apitest.cc index 13be5fd..fac6362 100644 --- a/chrome/browser/extensions/content_script_all_frames_apitest.cc +++ b/chrome/browser/extensions/content_script_all_frames_apitest.cc @@ -5,11 +5,11 @@ #include "chrome/browser/extensions/extension_apitest.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptAllFrames) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("content_scripts/all_frames")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptExtensionIframe) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("content_scripts/extension_iframe")) << message_; } diff --git a/chrome/browser/extensions/content_script_extension_process_apitest.cc b/chrome/browser/extensions/content_script_extension_process_apitest.cc index 16258fa..46729d2 100644 --- a/chrome/browser/extensions/content_script_extension_process_apitest.cc +++ b/chrome/browser/extensions/content_script_extension_process_apitest.cc @@ -10,6 +10,6 @@ #include "chrome/test/ui_test_utils.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptExtensionProcess) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("content_scripts/extension_process")) << message_; } diff --git a/chrome/browser/extensions/cross_origin_xhr_apitest.cc b/chrome/browser/extensions/cross_origin_xhr_apitest.cc index a2cf9d8..41474bc 100644 --- a/chrome/browser/extensions/cross_origin_xhr_apitest.cc +++ b/chrome/browser/extensions/cross_origin_xhr_apitest.cc @@ -7,6 +7,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHR) { host_resolver()->AddRule("*.com", "127.0.0.1"); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("cross_origin_xhr")) << message_; } diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc index 07c141c..f6c963b 100644 --- a/chrome/browser/extensions/execute_script_apitest.cc +++ b/chrome/browser/extensions/execute_script_apitest.cc @@ -12,7 +12,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_ExecuteScript) { host_resolver()->AddRuleWithLatency("a.com", "127.0.0.1", 500); host_resolver()->AddRule("b.com", "127.0.0.1"); host_resolver()->AddRule("c.com", "127.0.0.1"); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("executescript/basic")) << message_; ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_; @@ -23,7 +23,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_ExecuteScript) { // (ExecuteScript) tests are de-flakified, reunite this case with it's brethern. IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ExecuteScriptFileAfterClose) { host_resolver()->AddRule("b.com", "127.0.0.1"); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("executescript/file_after_close")) << message_; } diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index 038d07f..99966df 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -76,7 +76,7 @@ static ExtensionHost* FindHostWithPath(ExtensionProcessManager* manager, // extension specifies in permissions but not from others. IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, OriginPrivileges) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(LoadExtension(test_data_dir_ .AppendASCII("origin_privileges").AppendASCII("extension"))); @@ -146,8 +146,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TabContents) { // Tests that we can load page actions in the Omnibox. IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageAction) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // This page action will not show an icon, since it doesn't specify one but // is included here to test for a crash (http://crbug.com/25562). @@ -161,13 +160,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageAction) { ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0)); // Navigate to the feed page. - GURL feed_url = server->TestServerPage(kFeedPage); + GURL feed_url = 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 = server->TestServerPage(kNoFeedPage); + GURL no_feed = test_server()->GetURL(kNoFeedPage); ui_test_utils::NavigateToURL(browser(), no_feed); // Make sure the page action goes away. ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0)); @@ -175,8 +174,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) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); FilePath extension_path(test_data_dir_.AppendASCII("api_test") .AppendASCII("page_action") @@ -184,31 +182,30 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionInPageNavigation) { ASSERT_TRUE(LoadExtension(extension_path)); // Page action should become visible when we navigate here. - GURL feed_url = server->TestServerPage(kHashPageA); + GURL feed_url = test_server()->GetURL(kHashPageA); ui_test_utils::NavigateToURL(browser(), feed_url); ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1)); // In-page navigation, page action should remain. - feed_url = server->TestServerPage(kHashPageAHash); + feed_url = 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 = server->TestServerPage(kHashPageB); + feed_url = 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) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); 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 = server->TestServerPage(kFeedPage); + GURL feed_url = test_server()->GetURL(kFeedPage); ui_test_utils::NavigateToURL(browser(), feed_url); ASSERT_TRUE(WaitForPageActionCountChangeTo(1)); @@ -257,8 +254,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PageActionRefreshCrash) { // 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) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action"))); @@ -266,7 +262,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, RSSMultiRelLink) { ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(0)); // Navigate to the feed page. - GURL feed_url = server->TestServerPage(kFeedPageMultiRel); + GURL feed_url = 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)); @@ -296,8 +292,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationBrowserAction) { // 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) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); ExtensionsService* service = browser()->profile()->GetExtensionsService(); const size_t size_before = service->extensions()->size(); @@ -307,7 +302,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationPageAction) { ASSERT_TRUE(LoadExtension(extension_path)); // Any navigation prompts the location bar to load the page action. - GURL url = server->TestServerPage(kLocalization); + GURL url = test_server()->GetURL(kLocalization); ui_test_utils::NavigateToURL(browser(), url); ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1)); @@ -323,9 +318,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationPageAction) { extension->page_action()->GetTitle(tab_id).c_str()); } -GURL GetFeedUrl(net::HTTPTestServer* server, const std::string& feed_page, +GURL GetFeedUrl(net::TestServer* server, const std::string& feed_page, bool direct_url, std::string extension_id) { - GURL feed_url = server->TestServerPage(feed_page); + GURL feed_url = server->GetURL(feed_page); if (direct_url) { // We navigate directly to the subscribe page for feeds where the feed // sniffing won't work, in other words, as is the case for malformed feeds. @@ -386,7 +381,7 @@ bool ValidatePageElement(TabContents* tab, // extension to kick in, detect the feed and redirect to a feed preview page. // |sniff_xml_type| is generally set to true if the feed is sniffable and false // for invalid feeds. -void NavigateToFeedAndValidate(net::HTTPTestServer* server, +void NavigateToFeedAndValidate(net::TestServer* server, const std::string& url, Browser* browser, bool sniff_xml_type, @@ -425,13 +420,12 @@ void NavigateToFeedAndValidate(net::HTTPTestServer* server, } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed1) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action"))); - NavigateToFeedAndValidate(server, kValidFeed1, browser(), true, + NavigateToFeedAndValidate(test_server(), kValidFeed1, browser(), true, "Feed for MyFeedTitle", "Title 1", "Desc", @@ -439,13 +433,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed1) { } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed2) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action"))); - NavigateToFeedAndValidate(server, kValidFeed2, browser(), true, + NavigateToFeedAndValidate(test_server(), kValidFeed2, browser(), true, "Feed for MyFeed2", "My item title1", "This is a summary.", @@ -453,13 +446,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed2) { } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed3) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action"))); - NavigateToFeedAndValidate(server, kValidFeed3, browser(), true, + NavigateToFeedAndValidate(test_server(), kValidFeed3, browser(), true, "Feed for Google Code buglist rss feed", "My dear title", "My dear content", @@ -467,13 +459,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed3) { } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed4) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action"))); - NavigateToFeedAndValidate(server, kValidFeed4, browser(), true, + NavigateToFeedAndValidate(test_server(), kValidFeed4, browser(), true, "Feed for Title chars <script> %23 stop", "Title chars %23 stop", "My dear content %23 stop", @@ -481,15 +472,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed4) { } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed0) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action"))); // Try a feed with a link with an onclick handler (before r27440 this would // trigger a NOTREACHED). - NavigateToFeedAndValidate(server, kValidFeed0, browser(), true, + NavigateToFeedAndValidate(test_server(), kValidFeed0, browser(), true, "Feed for MyFeedTitle", "Title 1", "Desc VIDEO", @@ -497,14 +487,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed0) { } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed5) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action"))); // Feed with valid but mostly empty xml. - NavigateToFeedAndValidate(server, kValidFeed5, browser(), true, + NavigateToFeedAndValidate(test_server(), kValidFeed5, browser(), true, "Feed for Unknown feed name", "element 'anchor_0' not found", "element 'desc_0' not found", @@ -512,14 +501,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed5) { } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed6) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action"))); // Feed that is technically invalid but still parseable. - NavigateToFeedAndValidate(server, kValidFeed6, browser(), true, + NavigateToFeedAndValidate(test_server(), kValidFeed6, browser(), true, "Feed for MyFeedTitle", "Title 1", "Desc", @@ -527,14 +515,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeed6) { } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedInvalidFeed1) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action"))); // Try an empty feed. - NavigateToFeedAndValidate(server, kInvalidFeed1, browser(), false, + NavigateToFeedAndValidate(test_server(), kInvalidFeed1, browser(), false, "Feed for Unknown feed name", "element 'anchor_0' not found", "element 'desc_0' not found", @@ -542,14 +529,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedInvalidFeed1) { } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedInvalidFeed2) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action"))); // Try a garbage feed. - NavigateToFeedAndValidate(server, kInvalidFeed2, browser(), false, + NavigateToFeedAndValidate(test_server(), kInvalidFeed2, browser(), false, "Feed for Unknown feed name", "element 'anchor_0' not found", "element 'desc_0' not found", @@ -557,14 +543,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedInvalidFeed2) { } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedInvalidFeed3) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action"))); // Try a feed that doesn't exist. - NavigateToFeedAndValidate(server, "foo.xml", browser(), false, + NavigateToFeedAndValidate(test_server(), "foo.xml", browser(), false, "Feed for Unknown feed name", "element 'anchor_0' not found", "element 'desc_0' not found", @@ -572,14 +557,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedInvalidFeed3) { } IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ParseFeedValidFeedNoLinks) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("subscribe_page_action"))); // Valid feed but containing no links. - NavigateToFeedAndValidate(server, kValidFeedNoLinks, browser(), true, + NavigateToFeedAndValidate(test_server(), kValidFeedNoLinks, browser(), true, "Feed for MyFeedTitle", "Title with no link", "Desc", diff --git a/chrome/browser/extensions/extension_clipboard_apitest.cc b/chrome/browser/extensions/extension_clipboard_apitest.cc index cfabacf..c159f97 100644 --- a/chrome/browser/extensions/extension_clipboard_apitest.cc +++ b/chrome/browser/extensions/extension_clipboard_apitest.cc @@ -10,6 +10,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Clipboard) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("clipboard")) << message_; } diff --git a/chrome/browser/extensions/extension_history_apitest.cc b/chrome/browser/extensions/extension_history_apitest.cc index a9a99ef..9815ac8 100644 --- a/chrome/browser/extensions/extension_history_apitest.cc +++ b/chrome/browser/extensions/extension_history_apitest.cc @@ -11,7 +11,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_History) { host_resolver()->AddRule("www.a.com", "127.0.0.1"); host_resolver()->AddRule("www.b.com", "127.0.0.1"); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("history")) << message_; } diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc index 2c6dc73..dbc9234c 100644 --- a/chrome/browser/extensions/extension_incognito_apitest.cc +++ b/chrome/browser/extensions/extension_incognito_apitest.cc @@ -18,7 +18,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, IncognitoNoScript) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); // Loads a simple extension which attempts to change the title of every page // that loads to "modified". @@ -44,7 +44,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, IncognitoNoScript) { IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, IncognitoYesScript) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); // Load a dummy extension. This just tests that we don't regress a // crash fix when multiple incognito- and non-incognito-enabled extensions @@ -81,7 +81,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, IncognitoYesScript) { // Tests that the APIs in an incognito-enabled extension work properly. IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Incognito) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ResultCatcher catcher; @@ -99,7 +99,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Incognito) { // events or callbacks. IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabled) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ResultCatcher catcher; @@ -116,7 +116,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabled) { // Test that opening a popup from an incognito browser window works properly. IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoPopup) { host_resolver()->AddRule("*", "127.0.0.1"); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ResultCatcher catcher; diff --git a/chrome/browser/extensions/extension_javascript_url_apitest.cc b/chrome/browser/extensions/extension_javascript_url_apitest.cc index 601a9e4..2b6cf59 100644 --- a/chrome/browser/extensions/extension_javascript_url_apitest.cc +++ b/chrome/browser/extensions/extension_javascript_url_apitest.cc @@ -8,7 +8,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, JavaScriptURLPermissions) { host_resolver()->AddRule("a.com", "127.0.0.1"); host_resolver()->AddRule("b.com", "127.0.0.1"); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("tabs/javascript_url_permissions")) << message_; } diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc index eed3657..9a393c6 100644 --- a/chrome/browser/extensions/extension_messages_apitest.cc +++ b/chrome/browser/extensions/extension_messages_apitest.cc @@ -51,7 +51,7 @@ class MessageSender : public NotificationObserver { // Tests that message passing between extensions and content scripts works. IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Messaging) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("messaging/connect")) << message_; } diff --git a/chrome/browser/extensions/extension_omnibox_apitest.cc b/chrome/browser/extensions/extension_omnibox_apitest.cc index 109faf3..1e3abc6 100644 --- a/chrome/browser/extensions/extension_omnibox_apitest.cc +++ b/chrome/browser/extensions/extension_omnibox_apitest.cc @@ -68,7 +68,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, Basic) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("omnibox")) << message_; // The results depend on the TemplateURLModel being loaded. Make sure it is diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index c0a00f77..0b654f0 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -26,7 +26,7 @@ #endif IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); // The test creates a tab and checks that the URL of the new tab // is that of the new tab page. Make sure the pref that controls @@ -38,34 +38,34 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) { } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabGetCurrent) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("tabs/get_current")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabConnect) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabOnRemoved) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CaptureVisibleTabJpeg) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", "test_jpeg.html")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FAILS_CaptureVisibleTabPng) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", "test_png.html")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnUpdated) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("tabs/on_updated")) << message_; } diff --git a/chrome/browser/extensions/fragment_navigation_apitest.cc b/chrome/browser/extensions/fragment_navigation_apitest.cc index d44c35a..aa7bc46 100644 --- a/chrome/browser/extensions/fragment_navigation_apitest.cc +++ b/chrome/browser/extensions/fragment_navigation_apitest.cc @@ -6,13 +6,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptFragmentNavigation) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); const char* extension_name = "content_scripts/fragment"; ASSERT_TRUE(RunExtensionTest(extension_name)) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ExecuteScriptFragmentNavigation) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); const char* extension_name = "executescript/fragment"; ASSERT_TRUE(RunExtensionTest(extension_name)) << message_; } diff --git a/chrome/browser/extensions/isolated_world_apitest.cc b/chrome/browser/extensions/isolated_world_apitest.cc index f3ef0eb..4b0761d 100644 --- a/chrome/browser/extensions/isolated_world_apitest.cc +++ b/chrome/browser/extensions/isolated_world_apitest.cc @@ -7,7 +7,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IsolatedWorld1) { // This extension runs various bits of script and tests that they all run in // the same isolated world. - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("content_scripts/isolated_world1")) << message_; // Now load a different extension, inject into same page, verify worlds aren't diff --git a/chrome/browser/extensions/page_action_apitest.cc b/chrome/browser/extensions/page_action_apitest.cc index 6eb30dd..4ae4b39 100644 --- a/chrome/browser/extensions/page_action_apitest.cc +++ b/chrome/browser/extensions/page_action_apitest.cc @@ -15,7 +15,7 @@ #include "chrome/test/ui_test_utils.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("page_action/basics")) << message_; Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; diff --git a/chrome/browser/extensions/stubs_apitest.cc b/chrome/browser/extensions/stubs_apitest.cc index fe06c6a..72e3a48 100644 --- a/chrome/browser/extensions/stubs_apitest.cc +++ b/chrome/browser/extensions/stubs_apitest.cc @@ -16,14 +16,13 @@ // should be available in content scripts) or update the list of privileged APIs // in renderer_extension_bindings.js. IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Stubs) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("stubs")) << message_; // Navigate to a simple http:// page, which should get the content script // injected and run the rest of the test. - GURL url = server->TestServerPage("file/extensions/test_file.html"); + GURL url(test_server()->GetURL("file/extensions/test_file.html")); ui_test_utils::NavigateToURL(browser(), url); ResultCatcher catcher; diff --git a/chrome/browser/find_bar_host_browsertest.cc b/chrome/browser/find_bar_host_browsertest.cc index 4c0606c..d68e35d 100644 --- a/chrome/browser/find_bar_host_browsertest.cc +++ b/chrome/browser/find_bar_host_browsertest.cc @@ -116,11 +116,10 @@ int FindInPageWchar(TabContents* tab, // This test loads a page with frames and starts FindInPage requests. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageFrames) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our frames page. - GURL url = server->TestServerPage(kFramePage); + GURL url = test_server()->GetURL(kFramePage); ui_test_utils::NavigateToURL(browser(), url); // Try incremental search (mimicking user typing in). @@ -209,11 +208,10 @@ std::string FocusedOnPage(TabContents* tab_contents) { // close the Find box (ie. if you find within a link the link should be // focused). IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageEndState) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our special focus tracking page. - GURL url = server->TestServerPage(kEndState); + GURL url = test_server()->GetURL(kEndState); ui_test_utils::NavigateToURL(browser(), url); TabContents* tab_contents = browser()->GetSelectedTabContents(); @@ -257,11 +255,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageEndState) { // This test loads a single-frame page and makes sure the ordinal returned makes // sense as we FindNext over all the items. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageOrdinal) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our page. - GURL url = server->TestServerPage(kFrameData); + GURL url = test_server()->GetURL(kFrameData); ui_test_utils::NavigateToURL(browser(), url); // Search for 'o', which should make the first item active and return @@ -297,11 +294,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageOrdinal) { // This tests that the ordinal is correctly adjusted after a selection IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, SelectChangesOrdinal_Issue20883) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our test content. - GURL url = server->TestServerPage(kSelectChangesOrdinal); + GURL url = test_server()->GetURL(kSelectChangesOrdinal); ui_test_utils::NavigateToURL(browser(), url); TabContents* tab_contents = browser()->GetSelectedTabContents(); @@ -337,11 +333,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, // This test loads a page with frames and makes sure the ordinal returned makes // sense. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageMultiFramesOrdinal) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our page. - GURL url = server->TestServerPage(kFramePage); + GURL url = test_server()->GetURL(kFramePage); ui_test_utils::NavigateToURL(browser(), url); // Search for 'a', which should make the first item active and return @@ -389,11 +384,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageMultiFramesOrdinal) { // We could get ordinals out of whack when restarting search in subframes. // See http://crbug.com/5132. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPage_Issue5132) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our page. - GURL url = server->TestServerPage(kFramePage); + GURL url = test_server()->GetURL(kFramePage); ui_test_utils::NavigateToURL(browser(), url); // Search for 'goa' three times (6 matches on page). @@ -420,11 +414,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPage_Issue5132) { // Load a page with no selectable text and make sure we don't crash. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindUnSelectableText) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our page. - GURL url = server->TestServerPage(kUserSelectPage); + GURL url = test_server()->GetURL(kUserSelectPage); ui_test_utils::NavigateToURL(browser(), url); int ordinal = 0; @@ -438,11 +431,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindUnSelectableText) { // Try to reproduce the crash seen in issue 1341577. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindCrash_Issue1341577) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our page. - GURL url = server->TestServerPage(kCrashPage); + GURL url = test_server()->GetURL(kCrashPage); ui_test_utils::NavigateToURL(browser(), url); // This would crash the tab. These must be the first two find requests issued @@ -471,11 +463,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindCrash_Issue1341577) { // Try to reproduce the crash seen in http://crbug.com/14491, where an assert // hits in the BitStack size comparison in WebKit. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindCrash_Issue14491) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our page. - GURL url = server->TestServerPage(kBitstackCrash); + GURL url = test_server()->GetURL(kBitstackCrash); ui_test_utils::NavigateToURL(browser(), url); // This used to crash the tab. @@ -494,11 +485,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindCrash_Issue14491) { // ms) to find one or more of those matches (so Find times out and has to try // again from where it left off). IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindRestarts_Issue1155639) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our page. - GURL url = server->TestServerPage(kTooFewMatchesPage); + GURL url = test_server()->GetURL(kTooFewMatchesPage); ui_test_utils::NavigateToURL(browser(), url); // This string appears 5 times at the bottom of a long page. If Find restarts @@ -512,11 +502,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindRestarts_Issue1155639) { // This tests bug 11761: FindInPage terminates search prematurely. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FAILS_FindInPagePrematureEnd) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our special focus tracking page. - GURL url = server->TestServerPage(kPrematureEnd); + GURL url = test_server()->GetURL(kPrematureEnd); ui_test_utils::NavigateToURL(browser(), url); TabContents* tab_contents = browser()->GetSelectedTabContents(); @@ -530,12 +519,11 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FAILS_FindInPagePrematureEnd) { } IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindDisappearOnNavigate) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our special focus tracking page. - GURL url = server->TestServerPage(kSimplePage); - GURL url2 = server->TestServerPage(kFramePage); + GURL url = test_server()->GetURL(kSimplePage); + GURL url2 = test_server()->GetURL(kFramePage); ui_test_utils::NavigateToURL(browser(), url); browser()->ShowFindBar(); @@ -571,11 +559,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindDisappearOnNavigate) { // when a New Tab is opened. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindDisappearOnNewTabAndHistory) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our special focus tracking page. - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); browser()->ShowFindBar(); @@ -619,10 +606,9 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, // Make sure Find box moves out of the way if it is obscuring the active match. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_FindMovesWhenObscuring) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); - GURL url = server->TestServerPage(kMoveIfOver); + GURL url = test_server()->GetURL(kMoveIfOver); ui_test_utils::NavigateToURL(browser(), url); browser()->ShowFindBar(); @@ -678,11 +664,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_FindMovesWhenObscuring) { // Make sure F3 in a new tab works if Find has previous string to search for. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindNextInNewTabUsesPrepopulate) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to any page. - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); // Search for 'no_match'. No matches should be found. @@ -725,11 +710,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, #else IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, AcceleratorRestoring) { #endif - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to any page. - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); views::FocusManager* focus_manager = @@ -764,11 +748,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, // Make sure Find box does not become UI-inactive when no text is in the box as // we switch to a tab contents with an empty find string. See issue 13570. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, StayActive) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to any page. - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); browser()->ShowFindBar(); @@ -789,11 +772,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, StayActive) { // Make sure F3 works after you FindNext a couple of times and end the Find // session. See issue http://crbug.com/28306. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, RestartSearchFromF3) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to a simple page. - GURL url = server->TestServerPage(kSimple); + GURL url = test_server()->GetURL(kSimple); ui_test_utils::NavigateToURL(browser(), url); // Search for 'page'. Should have 1 match. @@ -821,11 +803,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, RestartSearchFromF3) { // with the last search from the same tab rather than the last overall search. // http://crbug.com/30006 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PreferPreviousSearch) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to any page. - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); // Find "Default". @@ -863,11 +844,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulateSameTab) { return; #endif - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to any page. - GURL url = server->TestServerPage(kSimple); + GURL url = test_server()->GetURL(kSimple); ui_test_utils::NavigateToURL(browser(), url); // Search for the word "page". @@ -901,11 +881,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulateInNewTab) { return; #endif - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to any page. - GURL url = server->TestServerPage(kSimple); + GURL url = test_server()->GetURL(kSimple); ui_test_utils::NavigateToURL(browser(), url); // Search for the word "page". @@ -940,11 +919,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulatePreserveLast) { return; #endif - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to any page. - GURL url = server->TestServerPage(kSimple); + GURL url = test_server()->GetURL(kSimple); ui_test_utils::NavigateToURL(browser(), url); // Search for the word "page". @@ -1019,11 +997,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_NoIncognitoPrepopulate) { return; #endif - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to the "simple" test page. - GURL url = server->TestServerPage(kSimple); + GURL url = test_server()->GetURL(kSimple); ui_test_utils::NavigateToURL(browser(), url); // Search for the word "page" in the normal browser tab. @@ -1089,11 +1066,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_NoIncognitoPrepopulate) { // This makes sure that dismissing the find bar with kActivateSelection works. IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_ActivateLinkNavigatesPage) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our test content. - GURL url = server->TestServerPage(kLinkPage); + GURL url = test_server()->GetURL(kLinkPage); ui_test_utils::NavigateToURL(browser(), url); TabContents* tab = browser()->GetSelectedTabContents(); diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index a9cee1f..9e975a9 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -205,14 +205,12 @@ class GeolocationBrowserTest : public InProcessBrowserTest { bool Initialize(InitializationOptions options) WARN_UNUSED_RESULT { GeolocationArbitrator::SetProviderFactoryForTest( &NewAutoSuccessMockNetworkLocationProvider); - if (!server_.get()) { - server_ = StartHTTPServer(); - EXPECT_TRUE(server_.get()); - if (!server_.get()) - return false; - } + bool started = test_server()->Start(); + EXPECT_TRUE(started); + if (!started) + return false; - current_url_ = server_->TestServerPage(html_for_tests_); + current_url_ = test_server()->GetURL(html_for_tests_); LOG(WARNING) << "before navigate"; if (options == INITIALIZATION_OFFTHERECORD) { ui_test_utils::OpenURLOffTheRecord(browser()->profile(), current_url_); @@ -330,7 +328,6 @@ class GeolocationBrowserTest : public InProcessBrowserTest { expected, function, current_browser_->GetSelectedTabContents()); } - scoped_refptr<net::HTTPTestServer> server_; InfoBarDelegate* infobar_; Browser* current_browser_; // path element of a URL referencing the html content for this test. diff --git a/chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc b/chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc index 60d6b8f..0d5d030 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk_interactive_uitest.cc @@ -13,7 +13,6 @@ namespace { -const wchar_t kDocRoot[] = L"chrome/test/data"; const char kSimplePage[] = "404_is_enough_for_us.html"; void OnClicked(GtkWidget* widget, bool* clicked_bit) { @@ -28,9 +27,7 @@ class BookmarkBarGtkBrowserTest : public InProcessBrowserTest { // Makes sure that when you switch back to an NTP with an active findbar, // the findbar is above the floating bookmark bar. IN_PROC_BROWSER_TEST_F(BookmarkBarGtkBrowserTest, FindBarTest) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server()->Start()); // Create new tab; open findbar. browser()->NewTab(); @@ -38,7 +35,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkBarGtkBrowserTest, FindBarTest) { // Create new tab with an arbitrary URL. Browser* browser_used = NULL; - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server()->GetURL(kSimplePage); browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, -1, TabStripModel::ADD_SELECTED, NULL, std::string(), &browser_used); @@ -59,9 +56,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkBarGtkBrowserTest, FindBarTest) { // Makes sure that you can click on the floating bookmark bar. IN_PROC_BROWSER_TEST_F(BookmarkBarGtkBrowserTest, ClickOnFloatingTest) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server()->Start()); GtkWidget* other_bookmarks = ViewIDUtil::GetWidget(GTK_WIDGET(browser()->window()->GetNativeHandle()), diff --git a/chrome/browser/history/multipart_uitest.cc b/chrome/browser/history/multipart_uitest.cc index aabf593..42339bf 100644 --- a/chrome/browser/history/multipart_uitest.cc +++ b/chrome/browser/history/multipart_uitest.cc @@ -30,16 +30,15 @@ class MultipartResponseUITest : public UITest { TEST_F(MultipartResponseUITest, MAYBE_SingleVisit) { // Make sure that visiting a multipart/x-mixed-replace site only // creates one entry in the visits table. - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server = - net::HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser_proxy.get()); scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetActiveTab()); ASSERT_TRUE(tab_proxy.get()); - NavigateToURL(server->TestServerPage("multipart")); + NavigateToURL(test_server.GetURL("multipart")); std::wstring title; EXPECT_TRUE(tab_proxy->GetTabTitle(&title)); EXPECT_EQ(L"page 9", title); diff --git a/chrome/browser/history/redirect_uitest.cc b/chrome/browser/history/redirect_uitest.cc index 6ea84ae..7e3ac11 100644 --- a/chrome/browser/history/redirect_uitest.cc +++ b/chrome/browser/history/redirect_uitest.cc @@ -20,18 +20,23 @@ namespace { -const wchar_t kDocRoot[] = L"chrome/test/data"; +class RedirectTest : public UITest { + public: + RedirectTest() + : test_server_(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { + } -typedef UITest RedirectTest; + protected: + net::TestServer test_server_; +}; // Tests a single server redirect TEST_F(RedirectTest, Server) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); - GURL final_url = server->TestServerPage(std::string()); - GURL first_url = server->TestServerPage( + GURL final_url = test_server_.GetURL(std::string()); + GURL first_url = test_server_.GetURL( "server-redirect?" + final_url.spec()); NavigateToURL(first_url); @@ -48,12 +53,10 @@ TEST_F(RedirectTest, Server) { // Tests a single client redirect. TEST_F(RedirectTest, Client) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); - GURL final_url = server->TestServerPage(std::string()); - GURL first_url = server->TestServerPage( + GURL final_url = test_server_.GetURL(std::string()); + GURL first_url = test_server_.GetURL( "client-redirect?" + final_url.spec()); // The client redirect appears as two page visits in the browser. @@ -82,11 +85,9 @@ TEST_F(RedirectTest, Client) { } TEST_F(RedirectTest, ClientEmptyReferer) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); - GURL final_url = server->TestServerPage(std::string()); + GURL final_url = test_server_.GetURL(std::string()); FilePath test_file(test_data_directory_); test_file = test_file.AppendASCII("file_client_redirect.html"); GURL first_url = net::FilePathToFileURL(test_file); @@ -142,16 +143,14 @@ TEST_F(RedirectTest, ClientCancelled) { // Tests a client->server->server redirect TEST_F(RedirectTest, ClientServerServer) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); - GURL final_url = server->TestServerPage(std::string()); - GURL next_to_last = server->TestServerPage( + GURL final_url = test_server_.GetURL(std::string()); + GURL next_to_last = test_server_.GetURL( "server-redirect?" + final_url.spec()); - GURL second_url = server->TestServerPage( + GURL second_url = test_server_.GetURL( "server-redirect?" + next_to_last.spec()); - GURL first_url = server->TestServerPage( + GURL first_url = test_server_.GetURL( "client-redirect?" + second_url.spec()); std::vector<GURL> redirects; @@ -176,14 +175,12 @@ TEST_F(RedirectTest, ClientServerServer) { // Tests that the "#reference" gets preserved across server redirects. TEST_F(RedirectTest, ServerReference) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); const std::string ref("reference"); - GURL final_url = server->TestServerPage(std::string()); - GURL initial_url = server->TestServerPage( + GURL final_url = test_server_.GetURL(std::string()); + GURL initial_url = test_server_.GetURL( "server-redirect?" + final_url.spec() + "#" + ref); NavigateToURL(initial_url); @@ -196,14 +193,12 @@ TEST_F(RedirectTest, ServerReference) { // A) does not crash the browser or confuse the redirect chain, see bug 1080873 // B) does not take place. TEST_F(RedirectTest, NoHttpToFile) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); FilePath test_file(test_data_directory_); test_file = test_file.AppendASCII("http_to_file.html"); GURL file_url = net::FilePathToFileURL(test_file); - GURL initial_url = server->TestServerPage( + GURL initial_url = test_server_.GetURL( "client-redirect?" + file_url.spec()); NavigateToURL(initial_url); @@ -219,9 +214,7 @@ TEST_F(RedirectTest, NoHttpToFile) { // Ensures that non-user initiated location changes (within page) are // flagged as client redirects. See bug 1139823. TEST_F(RedirectTest, ClientFragments) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); FilePath test_file(test_data_directory_); test_file = test_file.AppendASCII("ref_redirect.html"); @@ -253,13 +246,11 @@ 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. - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); - GURL final_url = server->TestServerPage("files/title2.html"); - GURL slow = server->TestServerPage("slow?60"); - GURL first_url = server->TestServerPage( + 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()); std::vector<GURL> redirects; diff --git a/chrome/browser/login_prompt_uitest.cc b/chrome/browser/login_prompt_uitest.cc index 91ee08f..11315ef 100644 --- a/chrome/browser/login_prompt_uitest.cc +++ b/chrome/browser/login_prompt_uitest.cc @@ -16,18 +16,18 @@ using std::wstring; namespace { -const wchar_t kDocRoot[] = L"chrome/test/data"; +const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); } // namespace class LoginPromptTest : public UITest { protected: LoginPromptTest() - : UITest(), - username_basic_(L"basicuser"), + : username_basic_(L"basicuser"), username_digest_(L"digestuser"), password_(L"secret"), - password_bad_(L"denyme") { + password_bad_(L"denyme"), + test_server_(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)) { } void AppendTab(const GURL& url) { @@ -41,6 +41,8 @@ class LoginPromptTest : public UITest { wstring username_digest_; wstring password_; wstring password_bad_; + + net::TestServer test_server_; }; wstring ExpectedTitleFromAuth(const wstring& username, @@ -51,12 +53,11 @@ wstring ExpectedTitleFromAuth(const wstring& username, // Test that "Basic" HTTP authentication works. TEST_F(LoginPromptTest, TestBasicAuth) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); + scoped_refptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab.get()); - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("auth-basic"))); + ASSERT_TRUE(tab->NavigateToURL(test_server_.GetURL("auth-basic"))); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_FALSE(tab->SetAuth(username_basic_, password_bad_)); @@ -64,7 +65,7 @@ TEST_F(LoginPromptTest, TestBasicAuth) { EXPECT_TRUE(tab->CancelAuth()); EXPECT_EQ(L"Denied: wrong password", GetActiveTabTitle()); - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("auth-basic"))); + ASSERT_TRUE(tab->NavigateToURL(test_server_.GetURL("auth-basic"))); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_TRUE(tab->SetAuth(username_basic_, password_)); @@ -74,19 +75,18 @@ TEST_F(LoginPromptTest, TestBasicAuth) { // Test that "Digest" HTTP authentication works. TEST_F(LoginPromptTest, TestDigestAuth) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); + scoped_refptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab.get()); - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("auth-digest"))); + ASSERT_TRUE(tab->NavigateToURL(test_server_.GetURL("auth-digest"))); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_FALSE(tab->SetAuth(username_digest_, password_bad_)); EXPECT_TRUE(tab->CancelAuth()); EXPECT_EQ(L"Denied: wrong password", GetActiveTabTitle()); - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("auth-digest"))); + ASSERT_TRUE(tab->NavigateToURL(test_server_.GetURL("auth-digest"))); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_TRUE(tab->SetAuth(username_digest_, password_)); @@ -96,19 +96,17 @@ TEST_F(LoginPromptTest, TestDigestAuth) { // Test that logging in on 2 tabs at once works. TEST_F(LoginPromptTest, TestTwoAuths) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); scoped_refptr<TabProxy> basic_tab(GetActiveTab()); ASSERT_TRUE(basic_tab.get()); - ASSERT_TRUE(basic_tab->NavigateToURL(server->TestServerPage("auth-basic"))); + ASSERT_TRUE(basic_tab->NavigateToURL(test_server_.GetURL("auth-basic"))); AppendTab(GURL(chrome::kAboutBlankURL)); scoped_refptr<TabProxy> digest_tab(GetActiveTab()); ASSERT_TRUE(digest_tab.get()); ASSERT_TRUE( - digest_tab->NavigateToURL(server->TestServerPage("auth-digest"))); + digest_tab->NavigateToURL(test_server_.GetURL("auth-digest"))); EXPECT_TRUE(basic_tab->NeedsAuth()); EXPECT_TRUE(basic_tab->SetAuth(username_basic_, password_)); @@ -125,37 +123,36 @@ TEST_F(LoginPromptTest, TestTwoAuths) { // Test that cancelling authentication works. TEST_F(LoginPromptTest, TestCancelAuth) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); + scoped_refptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab.get()); // First navigate to a test server page so we have something to go back to. - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("a"))); + ASSERT_TRUE(tab->NavigateToURL(test_server_.GetURL("a"))); // Navigating while auth is requested is the same as cancelling. - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("auth-basic"))); + ASSERT_TRUE(tab->NavigateToURL(test_server_.GetURL("auth-basic"))); EXPECT_TRUE(tab->NeedsAuth()); - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("b"))); + ASSERT_TRUE(tab->NavigateToURL(test_server_.GetURL("b"))); EXPECT_FALSE(tab->NeedsAuth()); - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("auth-basic"))); + ASSERT_TRUE(tab->NavigateToURL(test_server_.GetURL("auth-basic"))); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_TRUE(tab->GoBack()); // should bring us back to 'a' EXPECT_FALSE(tab->NeedsAuth()); // Now add a page and go back, so we have something to go forward to. - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("c"))); + ASSERT_TRUE(tab->NavigateToURL(test_server_.GetURL("c"))); EXPECT_TRUE(tab->GoBack()); // should bring us back to 'a' - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("auth-basic"))); + ASSERT_TRUE(tab->NavigateToURL(test_server_.GetURL("auth-basic"))); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_TRUE(tab->GoForward()); // should bring us to 'c' EXPECT_FALSE(tab->NeedsAuth()); // Now test that cancelling works as expected. - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("auth-basic"))); + ASSERT_TRUE(tab->NavigateToURL(test_server_.GetURL("auth-basic"))); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_TRUE(tab->CancelAuth()); EXPECT_FALSE(tab->NeedsAuth()); @@ -165,21 +162,19 @@ TEST_F(LoginPromptTest, TestCancelAuth) { // If multiple tabs are looking for the same auth, the user should only have to // enter it once (http://crbug.com/8914). TEST_F(LoginPromptTest, SupplyRedundantAuths) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); scoped_refptr<TabProxy> basic_tab1(GetActiveTab()); ASSERT_TRUE(basic_tab1.get()); ASSERT_TRUE( - basic_tab1->NavigateToURL(server->TestServerPage("auth-basic/1"))); + basic_tab1->NavigateToURL(test_server_.GetURL("auth-basic/1"))); EXPECT_TRUE(basic_tab1->NeedsAuth()); AppendTab(GURL(chrome::kAboutBlankURL)); scoped_refptr<TabProxy> basic_tab2(GetActiveTab()); ASSERT_TRUE(basic_tab2.get()); ASSERT_TRUE( - basic_tab2->NavigateToURL(server->TestServerPage("auth-basic/2"))); + basic_tab2->NavigateToURL(test_server_.GetURL("auth-basic/2"))); EXPECT_TRUE(basic_tab2->NeedsAuth()); // Set the auth in only one of the tabs (but wait for the other to load). @@ -200,21 +195,19 @@ TEST_F(LoginPromptTest, SupplyRedundantAuths) { // If multiple tabs are looking for the same auth, and one is cancelled, the // other should be cancelled as well. TEST_F(LoginPromptTest, CancelRedundantAuths) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); scoped_refptr<TabProxy> basic_tab1(GetActiveTab()); ASSERT_TRUE(basic_tab1.get()); ASSERT_TRUE( - basic_tab1->NavigateToURL(server->TestServerPage("auth-basic/1"))); + basic_tab1->NavigateToURL(test_server_.GetURL("auth-basic/1"))); EXPECT_TRUE(basic_tab1->NeedsAuth()); AppendTab(GURL(chrome::kAboutBlankURL)); scoped_refptr<TabProxy> basic_tab2(GetActiveTab()); ASSERT_TRUE(basic_tab2.get()); ASSERT_TRUE( - basic_tab2->NavigateToURL(server->TestServerPage("auth-basic/2"))); + basic_tab2->NavigateToURL(test_server_.GetURL("auth-basic/2"))); EXPECT_TRUE(basic_tab2->NeedsAuth()); // Cancel the auth in only one of the tabs (but wait for the other to load). diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc index 01a0345..686c601 100644 --- a/chrome/browser/net/connection_tester_unittest.cc +++ b/chrome/browser/net/connection_tester_unittest.cc @@ -71,7 +71,10 @@ class ConnectionTesterDelegate : public ConnectionTester::Delegate { // (so the test doesn't use any external network dependencies). class ConnectionTesterTest : public PlatformTest { public: - ConnectionTesterTest() : message_loop_(MessageLoop::TYPE_IO) { + ConnectionTesterTest() + : test_server_(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest"))), + message_loop_(MessageLoop::TYPE_IO) { scoped_refptr<net::RuleBasedHostResolverProc> catchall_resolver = new net::RuleBasedHostResolverProc(NULL); @@ -82,20 +85,19 @@ class ConnectionTesterTest : public PlatformTest { protected: net::ScopedDefaultHostResolverProc scoped_host_resolver_proc_; + net::TestServer test_server_; ConnectionTesterDelegate test_delegate_; MessageLoop message_loop_; }; TEST_F(ConnectionTesterTest, RunAllTests) { - scoped_refptr<net::HTTPTestServer> server = - net::HTTPTestServer::CreateServer(L"net/data/url_request_unittest/"); + ASSERT_TRUE(test_server_.Start()); ConnectionTester tester(&test_delegate_); // Start the test suite on URL "echoall". // TODO(eroman): Is this URL right? - GURL url = server->TestServerPage("echoall"); - tester.RunAllTests(url); + tester.RunAllTests(test_server_.GetURL("echoall")); // Wait for all the tests to complete. MessageLoop::current()->Run(); @@ -113,15 +115,13 @@ TEST_F(ConnectionTesterTest, RunAllTests) { } TEST_F(ConnectionTesterTest, DeleteWhileInProgress) { - scoped_refptr<net::HTTPTestServer> server = - net::HTTPTestServer::CreateServer(L"net/data/url_request_unittest/"); + ASSERT_TRUE(test_server_.Start()); scoped_ptr<ConnectionTester> tester(new ConnectionTester(&test_delegate_)); // Start the test suite on URL "echoall". // TODO(eroman): Is this URL right? - GURL url = server->TestServerPage("echoall"); - tester->RunAllTests(url); + tester->RunAllTests(test_server_.GetURL("echoall")); MessageLoop::current()->RunAllPending(); diff --git a/chrome/browser/net/cookie_policy_browsertest.cc b/chrome/browser/net/cookie_policy_browsertest.cc index 5b903e2..de87969 100644 --- a/chrome/browser/net/cookie_policy_browsertest.cc +++ b/chrome/browser/net/cookie_policy_browsertest.cc @@ -65,13 +65,12 @@ class CookiePolicyBrowserTest : public InProcessBrowserTest { // Visits a page that sets a first-party cookie. IN_PROC_BROWSER_TEST_F(CookiePolicyBrowserTest, AllowFirstPartyCookies) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server != NULL); + ASSERT_TRUE(test_server()->Start()); browser()->profile()->GetHostContentSettingsMap()-> SetBlockThirdPartyCookies(true); - GURL url = server->TestServerPage("set-cookie?cookie1"); + GURL url(test_server()->GetURL("set-cookie?cookie1")); std::string cookie = GetCookies(url); ASSERT_EQ("", cookie); @@ -86,19 +85,18 @@ IN_PROC_BROWSER_TEST_F(CookiePolicyBrowserTest, AllowFirstPartyCookies) { // a first-party cookie. IN_PROC_BROWSER_TEST_F(CookiePolicyBrowserTest, AllowFirstPartyCookiesRedirect) { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server != NULL); + ASSERT_TRUE(test_server()->Start()); browser()->profile()->GetHostContentSettingsMap()-> SetBlockThirdPartyCookies(true); - GURL url = server->TestServerPage("server-redirect?"); + GURL url(test_server()->GetURL("server-redirect?")); + GURL redirected_url(test_server()->GetURL("set-cookie?cookie2")); - GURL redirected_url = server->TestServerPage("set-cookie?cookie2"); - // Change the host name from localhost to www.example.com so it triggers + // Change the host name from 127.0.0.1 to www.example.com so it triggers // third-party cookie blocking if the first party for cookies URL is not // changed when we follow a redirect. - ASSERT_EQ("localhost", redirected_url.host()); + ASSERT_EQ("127.0.0.1", redirected_url.host()); GURL::Replacements replacements; std::string new_host("www.example.com"); replacements.SetHostStr(new_host); diff --git a/chrome/browser/net/ftp_browsertest.cc b/chrome/browser/net/ftp_browsertest.cc index 5033bf9..a639918 100644 --- a/chrome/browser/net/ftp_browsertest.cc +++ b/chrome/browser/net/ftp_browsertest.cc @@ -4,20 +4,21 @@ #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "googleurl/src/gurl.h" #include "net/test/test_server.h" #include "testing/gtest/include/gtest/gtest.h" class FtpBrowserTest : public InProcessBrowserTest { public: - FtpBrowserTest() : server_(net::FTPTestServer::CreateServer(L"")) { + FtpBrowserTest() : ftp_server_(net::TestServer::TYPE_FTP, FilePath()) { } protected: - scoped_refptr<net::FTPTestServer> server_; + net::TestServer ftp_server_; }; IN_PROC_BROWSER_TEST_F(FtpBrowserTest, DirectoryListing) { - ASSERT_TRUE(NULL != server_.get()); - ui_test_utils::NavigateToURL(browser(), server_->TestServerPage("/")); + ASSERT_TRUE(ftp_server_.Start()); + ui_test_utils::NavigateToURL(browser(), ftp_server_.GetURL("/")); // TODO(phajdan.jr): test more things. } diff --git a/chrome/browser/notifications/notifications_interactive_uitest.cc b/chrome/browser/notifications/notifications_interactive_uitest.cc index 656017a..e9a3efb 100644 --- a/chrome/browser/notifications/notifications_interactive_uitest.cc +++ b/chrome/browser/notifications/notifications_interactive_uitest.cc @@ -19,17 +19,16 @@ class NotificationsPermissionTest : public UITest { }; TEST_F(NotificationsPermissionTest, TestUserGestureInfobar) { - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(server.get() != NULL); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); scoped_refptr<TabProxy> tab(browser->GetActiveTab()); ASSERT_TRUE(tab.get()); ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, - tab->NavigateToURL(server->TestServerPage( + tab->NavigateToURL(test_server.GetURL( "files/notifications/notifications_request_function.html"))); WaitUntilTabCount(1); @@ -46,10 +45,9 @@ TEST_F(NotificationsPermissionTest, TestUserGestureInfobar) { } TEST_F(NotificationsPermissionTest, TestNoUserGestureInfobar) { - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(server.get() != NULL); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); @@ -59,7 +57,7 @@ TEST_F(NotificationsPermissionTest, TestNoUserGestureInfobar) { // Load a page which just does a request; no user gesture should result // in no infobar. ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, - tab->NavigateToURL(server->TestServerPage( + tab->NavigateToURL(test_server.GetURL( "files/notifications/notifications_request_inline.html"))); WaitUntilTabCount(1); diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc index 1d08d42..a87e2397 100644 --- a/chrome/browser/printing/printing_layout_uitest.cc +++ b/chrome/browser/printing/printing_layout_uitest.cc @@ -22,7 +22,7 @@ namespace { using printing::Image; const char kGenerateSwitch[] = "print-layout-generate"; -const wchar_t kDocRoot[] = L"chrome/test/data"; +const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); class PrintingLayoutTest : public PrintingTest<UITest> { public: @@ -289,11 +289,10 @@ TEST_F(PrintingLayoutTextTest, FAILS_Complex) { "close_printdlg_thread"); // Print a document, check its output. - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + ASSERT_TRUE(test_server.Start()); - NavigateToURL(server->TestServerPage("files/printing/test1.html")); + NavigateToURL(test_server.GetURL("files/printing/test1.html")); close_printdlg_thread.Start(); PrintNowTab(); close_printdlg_thread.Join(); @@ -321,9 +320,9 @@ TEST_F(PrintingLayoutTestHidden, DISABLED_ManyTimes) { if (IsTestCaseDisabled()) return; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + ASSERT_TRUE(test_server.Start()); + DismissTheWindow dismisser(base::GetProcId(process())); ASSERT_GT(arraysize(kTestPool), 0u); @@ -331,7 +330,7 @@ TEST_F(PrintingLayoutTestHidden, DISABLED_ManyTimes) { if (i) CleanupDumpDirectory(); const TestPool& test = kTestPool[i % arraysize(kTestPool)]; - NavigateToURL(server->TestServerPage(test.source)); + NavigateToURL(test_server.GetURL(test.source)); base::DelegateSimpleThread close_printdlg_thread1(&dismisser, "close_printdlg_thread"); EXPECT_EQ(NULL, FindDialogWindow(dismisser.owner_process())); @@ -372,15 +371,14 @@ TEST_F(PrintingLayoutTest, DISABLED_Delayed) { if (IsTestCaseDisabled()) return; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + ASSERT_TRUE(test_server.Start()); { scoped_refptr<TabProxy> tab_proxy(GetActiveTab()); ASSERT_TRUE(tab_proxy.get()); bool is_timeout = true; - GURL url = server->TestServerPage("files/printing/popup_delayed_print.htm"); + GURL url = test_server.GetURL("files/printing/popup_delayed_print.htm"); EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab_proxy->NavigateToURL(url)); @@ -391,7 +389,7 @@ TEST_F(PrintingLayoutTest, DISABLED_Delayed) { close_printdlg_thread.Join(); // Force a navigation elsewhere to verify that it's fine with it. - url = server->TestServerPage("files/printing/test1.html"); + url = test_server.GetURL("files/printing/test1.html"); EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab_proxy->NavigateToURL(url)); } @@ -407,14 +405,13 @@ TEST_F(PrintingLayoutTest, DISABLED_IFrame) { if (IsTestCaseDisabled()) return; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + ASSERT_TRUE(test_server.Start()); { scoped_refptr<TabProxy> tab_proxy(GetActiveTab()); ASSERT_TRUE(tab_proxy.get()); - GURL url = server->TestServerPage("files/printing/iframe.htm"); + GURL url = test_server.GetURL("files/printing/iframe.htm"); EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab_proxy->NavigateToURL(url)); @@ -425,7 +422,7 @@ TEST_F(PrintingLayoutTest, DISABLED_IFrame) { close_printdlg_thread.Join(); // Force a navigation elsewhere to verify that it's fine with it. - url = server->TestServerPage("files/printing/test1.html"); + url = test_server.GetURL("files/printing/test1.html"); EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab_proxy->NavigateToURL(url)); } diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc index 04835ff..6bfff9f 100644 --- a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc +++ b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc @@ -78,17 +78,16 @@ TEST_F(ResourceDispatcherTest, ContentDispositionInline) { // Test for bug #1091358. TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest) { - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser_proxy.get()); scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab()); ASSERT_TRUE(tab.get()); ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, - tab->NavigateToURL(server->TestServerPage( + tab->NavigateToURL(test_server.GetURL( "files/sync_xmlhttprequest.html"))); // Let's check the XMLHttpRequest ran successfully. @@ -100,17 +99,16 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest) { } TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest_Disallowed) { - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser_proxy.get()); scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab()); ASSERT_TRUE(tab.get()); ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, - tab->NavigateToURL(server->TestServerPage( + tab->NavigateToURL(test_server.GetURL( "files/sync_xmlhttprequest_disallowed.html"))); // Let's check the XMLHttpRequest ran successfully. @@ -125,10 +123,9 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest_Disallowed) { // downloadable) would trigger download and hang the renderer process, // if executed while navigating to a new page. TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest_DuringUnload) { - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser_proxy.get()); @@ -136,7 +133,7 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest_DuringUnload) { ASSERT_TRUE(tab.get()); ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, - tab->NavigateToURL(server->TestServerPage( + tab->NavigateToURL(test_server.GetURL( "files/sync_xmlhttprequest_during_unload.html"))); // Confirm that the page has loaded (since it changes its title during load). @@ -147,7 +144,7 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest_DuringUnload) { // Navigate to a new page, to dispatch unload event and trigger xhr. // (the bug would make this step hang the renderer). ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, - tab->NavigateToURL(server->TestServerPage("files/title2.html"))); + tab->NavigateToURL(test_server.GetURL("files/title2.html"))); // Check that the new page got loaded, and that no download was triggered. EXPECT_TRUE(tab->GetTabTitle(&tab_title)); @@ -162,17 +159,16 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest_DuringUnload) { // Tests that onunload is run for cross-site requests. (Bug 1114994) TEST_F(ResourceDispatcherTest, CrossSiteOnunloadCookie) { - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser_proxy.get()); scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab()); ASSERT_TRUE(tab.get()); - GURL url(server->TestServerPage("files/onunload_cookie.html")); + GURL url(test_server.GetURL("files/onunload_cookie.html")); ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(url)); // Confirm that the page has loaded (since it changes its title during load). @@ -255,17 +251,16 @@ TEST_F(ResourceDispatcherTest, CrossSiteNavigationNonBuffered) { // doctor page) still runs the onunload handler and can support navigations // away from the link doctor page. (Bug 1235537) TEST_F(ResourceDispatcherTest, CrossSiteNavigationErrorPage) { - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser_proxy.get()); scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab()); ASSERT_TRUE(tab.get()); - GURL url(server->TestServerPage("files/onunload_cookie.html")); + GURL url(test_server.GetURL("files/onunload_cookie.html")); ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(url)); // Confirm that the page has loaded (since it changes its title during load). @@ -294,7 +289,7 @@ TEST_F(ResourceDispatcherTest, CrossSiteNavigationErrorPage) { // TabContents was in the NORMAL state, it would ignore the attempt to run // the onunload handler, and the navigation would fail. // (Test by redirecting to javascript:window.location='someURL'.) - GURL test_url(server->TestServerPage("files/title2.html")); + GURL test_url(test_server.GetURL("files/title2.html")); std::string redirect_url = "javascript:window.location='" + test_url.possibly_invalid_spec() + "'"; ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, diff --git a/chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc b/chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc index 0223cb5..78409dd 100644 --- a/chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc +++ b/chrome/browser/renderer_host/test/render_view_host_manager_browsertest.cc @@ -35,14 +35,14 @@ class RenderViewHostManagerTest : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, SwapProcessWithRelNoreferrerAndTargetBlank) { // Start two servers with different sites. - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> http_server = - net::HTTPTestServer::CreateServer(kDocRoot); - scoped_refptr<net::HTTPSTestServer> https_server = - net::HTTPSTestServer::CreateGoodServer(kDocRoot); + ASSERT_TRUE(test_server()->Start()); + net::TestServer https_server_( + net::TestServer::TYPE_HTTPS, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(https_server_.Start()); // Load a page with links that open in a new window. - ui_test_utils::NavigateToURL(browser(), http_server->TestServerPage( + ui_test_utils::NavigateToURL(browser(), test_server()->GetURL( "files/click-noreferrer-links.html")); // Get the original SiteInstance for later comparison. @@ -78,14 +78,14 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DontSwapProcessWithOnlyTargetBlank) { // Start two servers with different sites. - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> http_server = - net::HTTPTestServer::CreateServer(kDocRoot); - scoped_refptr<net::HTTPSTestServer> https_server = - net::HTTPSTestServer::CreateGoodServer(kDocRoot); + ASSERT_TRUE(test_server()->Start()); + net::TestServer https_server_( + net::TestServer::TYPE_HTTPS, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(https_server_.Start()); // Load a page with links that open in a new window. - ui_test_utils::NavigateToURL(browser(), http_server->TestServerPage( + ui_test_utils::NavigateToURL(browser(), test_server()->GetURL( "files/click-noreferrer-links.html")); // Get the original SiteInstance for later comparison. @@ -121,14 +121,14 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DontSwapProcessWithOnlyRelNoreferrer) { // Start two servers with different sites. - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> http_server = - net::HTTPTestServer::CreateServer(kDocRoot); - scoped_refptr<net::HTTPSTestServer> https_server = - net::HTTPSTestServer::CreateGoodServer(kDocRoot); + ASSERT_TRUE(test_server()->Start()); + net::TestServer https_server_( + net::TestServer::TYPE_HTTPS, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(https_server_.Start()); // Load a page with links that open in a new window. - ui_test_utils::NavigateToURL(browser(), http_server->TestServerPage( + ui_test_utils::NavigateToURL(browser(), test_server()->GetURL( "files/click-noreferrer-links.html")); // Get the original SiteInstance for later comparison. diff --git a/chrome/browser/repost_form_warning_uitest.cc b/chrome/browser/repost_form_warning_uitest.cc index 8f779c7..c6e9514 100644 --- a/chrome/browser/repost_form_warning_uitest.cc +++ b/chrome/browser/repost_form_warning_uitest.cc @@ -15,7 +15,7 @@ namespace { -const wchar_t kDocRoot[] = L"chrome/test/data"; +const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); } // namespace @@ -29,9 +29,9 @@ typedef UITest RepostFormWarningTest; #endif TEST_F(RepostFormWarningTest, MAYBE_TestDoubleReload) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + ASSERT_TRUE(test_server.Start()); + scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); @@ -39,7 +39,7 @@ TEST_F(RepostFormWarningTest, MAYBE_TestDoubleReload) { ASSERT_TRUE(tab.get()); // Load a form. - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("files/form.html"))); + ASSERT_TRUE(tab->NavigateToURL(test_server.GetURL("files/form.html"))); // Submit it. ASSERT_TRUE(tab->NavigateToURL(GURL( "javascript:document.getElementById('form').submit()"))); @@ -49,7 +49,7 @@ TEST_F(RepostFormWarningTest, MAYBE_TestDoubleReload) { tab->ReloadAsync(); // Navigate away from the page (this is when the test usually crashes). - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("bar"))); + ASSERT_TRUE(tab->NavigateToURL(test_server.GetURL("bar"))); } #if defined(OS_WIN) @@ -60,9 +60,9 @@ TEST_F(RepostFormWarningTest, MAYBE_TestDoubleReload) { #endif TEST_F(RepostFormWarningTest, MAYBE_TestLoginAfterRepost) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); + ASSERT_TRUE(test_server.Start()); + scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); @@ -70,7 +70,7 @@ TEST_F(RepostFormWarningTest, MAYBE_TestLoginAfterRepost) { ASSERT_TRUE(tab.get()); // Load a form. - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("files/form.html"))); + ASSERT_TRUE(tab->NavigateToURL(test_server.GetURL("files/form.html"))); // Submit it. ASSERT_TRUE(tab->NavigateToURL(GURL( "javascript:document.getElementById('form').submit()"))); @@ -80,11 +80,11 @@ TEST_F(RepostFormWarningTest, MAYBE_TestLoginAfterRepost) { // Navigate to a page that requires authentication, bringing up another // tab-modal sheet. - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("auth-basic"))); + ASSERT_TRUE(tab->NavigateToURL(test_server.GetURL("auth-basic"))); // Try to reload it again. tab->ReloadAsync(); // Navigate away from the page. - ASSERT_TRUE(tab->NavigateToURL(server->TestServerPage("bar"))); + ASSERT_TRUE(tab->NavigateToURL(test_server.GetURL("bar"))); } diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc index 01e16884..ddb0f64 100644 --- a/chrome/browser/session_history_uitest.cc +++ b/chrome/browser/session_history_uitest.cc @@ -15,11 +15,11 @@ namespace { -const wchar_t kDocRoot[] = L"chrome/test/data"; - class SessionHistoryTest : public UITest { protected: - SessionHistoryTest() : UITest() { + SessionHistoryTest() + : test_server_(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { dom_automation_enabled_ = true; } @@ -77,27 +77,27 @@ class SessionHistoryTest : public UITest { protected: scoped_refptr<BrowserProxy> window_; scoped_refptr<TabProxy> tab_; + + net::TestServer test_server_; }; TEST_F(SessionHistoryTest, BasicBackForward) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); // about:blank should be loaded first. ASSERT_FALSE(tab_->GoBack()); EXPECT_EQ(L"", GetTabTitle()); ASSERT_TRUE(tab_->NavigateToURL( - server->TestServerPage("files/session_history/bot1.html"))); + test_server_.GetURL("files/session_history/bot1.html"))); EXPECT_EQ(L"bot1", GetTabTitle()); ASSERT_TRUE(tab_->NavigateToURL( - server->TestServerPage("files/session_history/bot2.html"))); + test_server_.GetURL("files/session_history/bot2.html"))); EXPECT_EQ(L"bot2", GetTabTitle()); ASSERT_TRUE(tab_->NavigateToURL( - server->TestServerPage("files/session_history/bot3.html"))); + test_server_.GetURL("files/session_history/bot3.html"))); EXPECT_EQ(L"bot3", GetTabTitle()); // history is [blank, bot1, bot2, *bot3] @@ -115,7 +115,7 @@ TEST_F(SessionHistoryTest, BasicBackForward) { EXPECT_EQ(L"bot1", GetTabTitle()); ASSERT_TRUE(tab_->NavigateToURL( - server->TestServerPage("files/session_history/bot3.html"))); + test_server_.GetURL("files/session_history/bot3.html"))); EXPECT_EQ(L"bot3", GetTabTitle()); // history is [blank, bot1, *bot3] @@ -147,9 +147,7 @@ TEST_F(SessionHistoryTest, BasicBackForward) { #define MAYBE_FrameBackForward FrameBackForward #endif TEST_F(SessionHistoryTest, MAYBE_FrameBackForward) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); // about:blank should be loaded first. GURL home(homepage_); @@ -157,7 +155,7 @@ TEST_F(SessionHistoryTest, MAYBE_FrameBackForward) { EXPECT_EQ(L"", GetTabTitle()); EXPECT_EQ(home, GetTabURL()); - GURL frames(server->TestServerPage("files/session_history/frames.html")); + GURL frames(test_server_.GetURL("files/session_history/frames.html")); ASSERT_TRUE(tab_->NavigateToURL(frames)); EXPECT_EQ(L"bot1", GetTabTitle()); EXPECT_EQ(frames, GetTabURL()); @@ -213,15 +211,13 @@ TEST_F(SessionHistoryTest, MAYBE_FrameBackForward) { // Test that back/forward preserves POST data and document state in subframes. TEST_F(SessionHistoryTest, FrameFormBackForward) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); // about:blank should be loaded first. ASSERT_FALSE(tab_->GoBack()); EXPECT_EQ(L"", GetTabTitle()); - GURL frames(server->TestServerPage("files/session_history/frames.html")); + GURL frames(test_server_.GetURL("files/session_history/frames.html")); ASSERT_TRUE(tab_->NavigateToURL(frames)); EXPECT_EQ(L"bot1", GetTabTitle()); @@ -275,15 +271,13 @@ TEST_F(SessionHistoryTest, FrameFormBackForward) { // across frames (ie, from frame -> nonframe). // Hangs, see http://crbug.com/45058. TEST_F(SessionHistoryTest, DISABLED_CrossFrameFormBackForward) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); // about:blank should be loaded first. ASSERT_FALSE(tab_->GoBack()); EXPECT_EQ(L"", GetTabTitle()); - GURL frames(server->TestServerPage("files/session_history/frames.html")); + GURL frames(test_server_.GetURL("files/session_history/frames.html")); ASSERT_TRUE(tab_->NavigateToURL(frames)); EXPECT_EQ(L"bot1", GetTabTitle()); @@ -321,15 +315,13 @@ TEST_F(SessionHistoryTest, DISABLED_CrossFrameFormBackForward) { // Test that back/forward entries are created for reference fragment // navigations. Bug 730379. TEST_F(SessionHistoryTest, FragmentBackForward) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); // about:blank should be loaded first. ASSERT_FALSE(tab_->GoBack()); EXPECT_EQ(L"", GetTabTitle()); - GURL fragment(server->TestServerPage("files/session_history/fragment.html")); + GURL fragment(test_server_.GetURL("files/session_history/fragment.html")); ASSERT_TRUE(tab_->NavigateToURL(fragment)); EXPECT_EQ(L"fragment", GetTabTitle()); EXPECT_EQ(fragment, GetTabURL()); @@ -368,7 +360,7 @@ TEST_F(SessionHistoryTest, FragmentBackForward) { ASSERT_TRUE(tab_->GoForward()); EXPECT_EQ(fragment_a, GetTabURL()); - GURL bot3(server->TestServerPage("files/session_history/bot3.html")); + GURL bot3(test_server_.GetURL("files/session_history/bot3.html")); ASSERT_TRUE(tab_->NavigateToURL(bot3)); EXPECT_EQ(L"bot3", GetTabTitle()); EXPECT_EQ(bot3, GetTabURL()); @@ -394,24 +386,22 @@ TEST_F(SessionHistoryTest, FragmentBackForward) { // TODO(brettw) bug 50648: fix flakyness. This test seems like it was failing // about 1/4 of the time on Vista by failing to execute JavascriptGo (see bug). TEST_F(SessionHistoryTest, FLAKY_JavascriptHistory) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); // about:blank should be loaded first. ASSERT_FALSE(tab_->GoBack()); EXPECT_EQ(L"", GetTabTitle()); ASSERT_TRUE(tab_->NavigateToURL( - server->TestServerPage("files/session_history/bot1.html"))); + test_server_.GetURL("files/session_history/bot1.html"))); EXPECT_EQ(L"bot1", GetTabTitle()); ASSERT_TRUE(tab_->NavigateToURL( - server->TestServerPage("files/session_history/bot2.html"))); + test_server_.GetURL("files/session_history/bot2.html"))); EXPECT_EQ(L"bot2", GetTabTitle()); ASSERT_TRUE(tab_->NavigateToURL( - server->TestServerPage("files/session_history/bot3.html"))); + test_server_.GetURL("files/session_history/bot3.html"))); EXPECT_EQ(L"bot3", GetTabTitle()); // history is [blank, bot1, bot2, *bot3] @@ -443,7 +433,7 @@ TEST_F(SessionHistoryTest, FLAKY_JavascriptHistory) { EXPECT_EQ(L"bot1", GetTabTitle()); ASSERT_TRUE(tab_->NavigateToURL( - server->TestServerPage("files/session_history/bot3.html"))); + test_server_.GetURL("files/session_history/bot3.html"))); EXPECT_EQ(L"bot3", GetTabTitle()); // history is [blank, bot1, *bot3] @@ -476,13 +466,11 @@ TEST_F(SessionHistoryTest, FLAKY_JavascriptHistory) { // This test is failing consistently. See http://crbug.com/22560 TEST_F(SessionHistoryTest, FAILS_LocationReplace) { + ASSERT_TRUE(test_server_.Start()); + // Test that using location.replace doesn't leave the title of the old page // visible. - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); - - ASSERT_TRUE(tab_->NavigateToURL(server->TestServerPage( + ASSERT_TRUE(tab_->NavigateToURL(test_server_.GetURL( "files/session_history/replace.html?no-title.html"))); EXPECT_EQ(L"", GetTabTitle()); } @@ -505,11 +493,9 @@ TEST_F(SessionHistoryTest, FLAKY_HistorySearchXSS) { } TEST_F(SessionHistoryTest, LocationChangeInSubframe) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(server.get()); + ASSERT_TRUE(test_server_.Start()); - ASSERT_TRUE(tab_->NavigateToURL(server->TestServerPage( + ASSERT_TRUE(tab_->NavigateToURL(test_server_.GetURL( "files/session_history/location_redirect.html"))); EXPECT_EQ(L"Default Title", GetTabTitle()); @@ -522,23 +508,21 @@ TEST_F(SessionHistoryTest, LocationChangeInSubframe) { } TEST_F(SessionHistoryTest, HistoryLength) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(server.get()); + ASSERT_TRUE(test_server_.Start()); int length; ASSERT_TRUE(tab_->ExecuteAndExtractInt( L"", L"domAutomationController.send(history.length)", &length)); EXPECT_EQ(1, length); - ASSERT_TRUE(tab_->NavigateToURL(server->TestServerPage("files/title1.html"))); + ASSERT_TRUE(tab_->NavigateToURL(test_server_.GetURL("files/title1.html"))); ASSERT_TRUE(tab_->ExecuteAndExtractInt( L"", L"domAutomationController.send(history.length)", &length)); EXPECT_EQ(2, length); // Now test that history.length is updated when the navigation is committed. - ASSERT_TRUE(tab_->NavigateToURL(server->TestServerPage( + ASSERT_TRUE(tab_->NavigateToURL(test_server_.GetURL( "files/session_history/record_length.html"))); ASSERT_TRUE(tab_->ExecuteAndExtractInt( L"", L"domAutomationController.send(history.length)", &length)); @@ -551,7 +535,7 @@ TEST_F(SessionHistoryTest, HistoryLength) { ASSERT_TRUE(tab_->GoBack()); // Ensure history.length is properly truncated. - ASSERT_TRUE(tab_->NavigateToURL(server->TestServerPage("files/title2.html"))); + ASSERT_TRUE(tab_->NavigateToURL(test_server_.GetURL("files/title2.html"))); ASSERT_TRUE(tab_->ExecuteAndExtractInt( L"", L"domAutomationController.send(history.length)", &length)); EXPECT_EQ(2, length); diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index 068a350..df29c13 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -144,11 +144,11 @@ TEST_F(SessionRestoreUITest, RestoresForwardAndBackwardNavs) { // are given appropriate max page IDs, so that going back to a restored // cross-site page and then forward again works. (Bug 1204135) TEST_F(SessionRestoreUITest, RestoresCrossSiteForwardAndBackwardNavs) { - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); - GURL cross_site_url(server->TestServerPage("files/title2.html")); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); + + GURL cross_site_url(test_server.GetURL("files/title2.html")); // Visit URLs on different sites. NavigateToURL(url1_); diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 284d6ac..54abc50 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/time.h" +#include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" @@ -15,26 +16,20 @@ #include "net/base/cert_status_flags.h" #include "net/test/test_server.h" -const wchar_t kDocRoot[] = L"chrome/test/data"; +const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); class SSLUITest : public InProcessBrowserTest { public: - SSLUITest() { + SSLUITest() + : https_server_(net::TestServer::TYPE_HTTPS, FilePath(kDocRoot)), + https_server_expired_(net::TestServer::TYPE_HTTPS_EXPIRED_CERTIFICATE, + FilePath(kDocRoot)), + https_server_mismatched_( + net::TestServer::TYPE_HTTPS_MISMATCHED_HOSTNAME, + FilePath(kDocRoot)) { EnableDOMAutomation(); } - scoped_refptr<net::HTTPTestServer> PlainServer() { - return net::HTTPTestServer::CreateServer(kDocRoot); - } - - scoped_refptr<net::HTTPSTestServer> GoodCertServer() { - return net::HTTPSTestServer::CreateGoodServer(kDocRoot); - } - - scoped_refptr<net::HTTPSTestServer> BadCertServer() { - return net::HTTPSTestServer::CreateExpiredServer(kDocRoot); - } - void CheckAuthenticatedState(TabContents* tab, bool displayed_insecure_content) { NavigationEntry* entry = tab->controller().GetActiveEntry(); @@ -116,17 +111,20 @@ class SSLUITest : public InProcessBrowserTest { ui_test_utils::WaitForNavigation(&(tab->controller())); } + net::TestServer https_server_; + net::TestServer https_server_expired_; + net::TestServer https_server_mismatched_; + private: DISALLOW_COPY_AND_ASSIGN(SSLUITest); }; // Visits a regular page over http. IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTP) { - scoped_refptr<net::HTTPTestServer> server = PlainServer(); - ASSERT_TRUE(server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); ui_test_utils::NavigateToURL(browser(), - server->TestServerPage("files/ssl/google.html")); + test_server()->GetURL("files/ssl/google.html")); CheckUnauthenticatedState(browser()->GetSelectedTabContents()); } @@ -136,35 +134,31 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTP) { // TODO(jcampan): test that bad HTTPS content is blocked (otherwise we'll give // the secure cookies away!). IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPWithBrokenHTTPSResource) { - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_expired_.Start()); ui_test_utils::NavigateToURL(browser(), - http_server->TestServerPage("files/ssl/page_with_unsafe_contents.html")); + test_server()->GetURL("files/ssl/page_with_unsafe_contents.html")); CheckUnauthenticatedState(browser()->GetSelectedTabContents()); } // Visits a page over OK https: IN_PROC_BROWSER_TEST_F(SSLUITest, TestOKHTTPS) { - scoped_refptr<net::HTTPSTestServer> https_server = GoodCertServer(); - ASSERT_TRUE(https_server.get() != NULL); + ASSERT_TRUE(https_server_.Start()); ui_test_utils::NavigateToURL(browser(), - https_server->TestServerPage("files/ssl/google.html")); + https_server_.GetURL("files/ssl/google.html")); CheckAuthenticatedState(browser()->GetSelectedTabContents(), false); } // Visits a page with https error and proceed: IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndProceed) { - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(https_server_expired_.Start()); ui_test_utils::NavigateToURL(browser(), - bad_https_server->TestServerPage("files/ssl/google.html")); + https_server_expired_.GetURL("files/ssl/google.html")); TabContents* tab = browser()->GetSelectedTabContents(); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, @@ -188,23 +182,20 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndProceed) { FLAKY_TestHTTPSExpiredCertAndDontProceed #endif IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSExpiredCertAndDontProceed) { - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> good_https_server = GoodCertServer(); - ASSERT_TRUE(good_https_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_.Start()); + ASSERT_TRUE(https_server_expired_.Start()); // First navigate to an OK page. ui_test_utils::NavigateToURL(browser(), - good_https_server->TestServerPage("files/ssl/google.html")); + https_server_.GetURL("files/ssl/google.html")); TabContents* tab = browser()->GetSelectedTabContents(); NavigationEntry* entry = tab->controller().GetActiveEntry(); ASSERT_TRUE(entry); GURL cross_site_url = - bad_https_server->TestServerPage("files/ssl/google.html"); + https_server_expired_.GetURL("files/ssl/google.html"); // Change the host name from 127.0.0.1 to localhost so it triggers a // cross-site navigation so we can test http://crbug.com/5800 is gone. ASSERT_EQ("127.0.0.1", cross_site_url.host()); @@ -230,27 +221,25 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSExpiredCertAndDontProceed) { // Try to navigate to a new page. (to make sure bug 5800 is fixed). ui_test_utils::NavigateToURL(browser(), - http_server->TestServerPage("files/ssl/google.html")); + test_server()->GetURL("files/ssl/google.html")); CheckUnauthenticatedState(tab); } // Visits a page with https error and then goes back using Browser::GoBack. IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndGoBackViaButton) { - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_expired_.Start()); // First navigate to an HTTP page. ui_test_utils::NavigateToURL(browser(), - http_server->TestServerPage("files/ssl/google.html")); + test_server()->GetURL("files/ssl/google.html")); TabContents* tab = browser()->GetSelectedTabContents(); NavigationEntry* entry = tab->controller().GetActiveEntry(); ASSERT_TRUE(entry); // Now go to a bad HTTPS page that shows an interstitial. ui_test_utils::NavigateToURL(browser(), - bad_https_server->TestServerPage("files/ssl/google.html")); + https_server_expired_.GetURL("files/ssl/google.html")); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, true); // Interstitial showing @@ -265,21 +254,19 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndGoBackViaButton) { // Visits a page with https error and then goes back using GoToOffset. // Marked as flaky, see bug 40932. IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoBackViaMenu) { - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_expired_.Start()); // First navigate to an HTTP page. ui_test_utils::NavigateToURL(browser(), - http_server->TestServerPage("files/ssl/google.html")); + test_server()->GetURL("files/ssl/google.html")); TabContents* tab = browser()->GetSelectedTabContents(); NavigationEntry* entry = tab->controller().GetActiveEntry(); ASSERT_TRUE(entry); // Now go to a bad HTTPS page that shows an interstitial. ui_test_utils::NavigateToURL(browser(), - bad_https_server->TestServerPage("files/ssl/google.html")); + https_server_expired_.GetURL("files/ssl/google.html")); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, true); // Interstitial showing @@ -294,19 +281,17 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoBackViaMenu) { // Visits a page with https error and then goes forward using GoToOffset. // Marked as flaky, see bug 40932. IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoForward) { - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_expired_.Start()); // First navigate to two HTTP pages. ui_test_utils::NavigateToURL(browser(), - http_server->TestServerPage("files/ssl/google.html")); + test_server()->GetURL("files/ssl/google.html")); TabContents* tab = browser()->GetSelectedTabContents(); NavigationEntry* entry1 = tab->controller().GetActiveEntry(); ASSERT_TRUE(entry1); ui_test_utils::NavigateToURL(browser(), - http_server->TestServerPage("files/ssl/blank_page.html")); + test_server()->GetURL("files/ssl/blank_page.html")); NavigationEntry* entry2 = tab->controller().GetActiveEntry(); ASSERT_TRUE(entry2); @@ -319,7 +304,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoForward) { // Now go to a bad HTTPS page that shows an interstitial. ui_test_utils::NavigateToURL(browser(), - bad_https_server->TestServerPage("files/ssl/google.html")); + https_server_expired_.GetURL("files/ssl/google.html")); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, true); // Interstitial showing @@ -340,42 +325,22 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoForward) { // does not cause any problems (it was causing a crasher, see // http://crbug.com/19941). IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorWithNoNavEntry) { - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); - - // Load a page with a link that opens a new window (therefore with no history - // and no navigation entries). - ui_test_utils::NavigateToURL(browser(), - http_server->TestServerPage("files/ssl/page_with_blank_target.html")); - - bool success = false; + ASSERT_TRUE(https_server_expired_.Start()); ui_test_utils::WindowedNotificationObserver<NavigationController> load_stop_signal(NotificationType::LOAD_STOP, NULL); + Browser* used_browser = NULL; + TabContents* tab_contents = browser()->AddTabWithURL( + https_server_expired_.GetURL("files/ssl/google.htm"), GURL(), + PageTransition::TYPED, -1, TabStripModel::ADD_SELECTED, + NULL, std::string(), &used_browser); + load_stop_signal.WaitFor(&(tab_contents->controller())); - // Simulate clicking the link (and therefore navigating to that new page). - // This will causes a new tab to be created. - EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetSelectedTabContents()->render_view_host(), std::wstring(), - L"window.domAutomationController.send(navigateInNewTab());", - &success)); - EXPECT_TRUE(success); - - // By the time we got a response, the new tab should have been created and be - // the selected tab. - EXPECT_EQ(2, browser()->tab_count()); - EXPECT_EQ(1, browser()->selected_index()); - - // Since the navigation was initiated by the renderer (when we clicked on the - // link) and since the main page network request failed, we won't get a - // navigation entry committed. So we'll just wait for the load to stop. - load_stop_signal.WaitFor( - &(browser()->GetSelectedTabContents()->controller())); + // Verify our assumption that there was no prior navigation. + EXPECT_FALSE(browser()->command_updater()->IsCommandEnabled(IDC_BACK)); // We should have an interstitial page showing. - ASSERT_TRUE(browser()->GetSelectedTabContents()->interstitial_page()); + ASSERT_TRUE(tab_contents->interstitial_page()); } // @@ -384,13 +349,11 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorWithNoNavEntry) { // Visits a page that displays insecure content. IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContent) { - scoped_refptr<net::HTTPSTestServer> https_server = GoodCertServer(); - ASSERT_TRUE(https_server.get() != NULL); - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_.Start()); // Load a page that displays insecure content. - ui_test_utils::NavigateToURL(browser(), https_server->TestServerPage( + ui_test_utils::NavigateToURL(browser(), https_server_.GetURL( "files/ssl/page_displays_insecure_content.html")); CheckAuthenticatedState(browser()->GetSelectedTabContents(), true); @@ -400,12 +363,10 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContent) { // content warnings by randomizing location.hash. // Based on http://crbug.com/8706 IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecuredContentRandomizeHash) { - scoped_refptr<net::HTTPSTestServer> https_server = GoodCertServer(); - ASSERT_TRUE(https_server.get() != NULL); - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_.Start()); - ui_test_utils::NavigateToURL(browser(), https_server->TestServerPage( + ui_test_utils::NavigateToURL(browser(), https_server_.GetURL( "files/ssl/page_runs_insecure_content.html")); CheckAuthenticationBrokenState(browser()->GetSelectedTabContents(), 0, true, @@ -417,12 +378,10 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecuredContentRandomizeHash) { // - images and scripts are filtered out entirely // Marked as flaky, see bug 40932. IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContents) { - scoped_refptr<net::HTTPSTestServer> good_https_server = GoodCertServer(); - ASSERT_TRUE(good_https_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_expired_.Start()); - ui_test_utils::NavigateToURL(browser(), good_https_server->TestServerPage( + ui_test_utils::NavigateToURL(browser(), https_server_.GetURL( "files/ssl/page_with_unsafe_contents.html")); TabContents* tab = browser()->GetSelectedTabContents(); @@ -456,12 +415,10 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContents) { // Visits a page with insecure content loaded by JS (after the initial page // load). IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentLoadedFromJS) { - scoped_refptr<net::HTTPSTestServer> https_server = GoodCertServer(); - ASSERT_TRUE(https_server.get() != NULL); - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_.Start()); - ui_test_utils::NavigateToURL(browser(), https_server->TestServerPage( + ui_test_utils::NavigateToURL(browser(), https_server_.GetURL( "files/ssl/page_with_dynamic_insecure_content.html")); TabContents* tab = browser()->GetSelectedTabContents(); @@ -481,13 +438,11 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentLoadedFromJS) { // one that doesn't. The test checks that we do not propagate the insecure // content state from one to the other. IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentTwoTabs) { - scoped_refptr<net::HTTPSTestServer> https_server = GoodCertServer(); - ASSERT_TRUE(https_server.get() != NULL); - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_.Start()); ui_test_utils::NavigateToURL(browser(), - https_server->TestServerPage("files/ssl/blank_page.html")); + https_server_.GetURL("files/ssl/blank_page.html")); TabContents* tab1 = browser()->GetSelectedTabContents(); @@ -495,7 +450,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentTwoTabs) { CheckAuthenticatedState(tab1, false); // Create a new tab. - GURL url = https_server->TestServerPage( + GURL url = https_server_.GetURL( "files/ssl/page_displays_insecure_content.html"); TabContents* tab2 = browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, 0, TabStripModel::ADD_SELECTED, @@ -513,13 +468,11 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentTwoTabs) { // that doesn't. The test checks that we propagate the insecure content state // from one to the other. IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecureContentTwoTabs) { - scoped_refptr<net::HTTPSTestServer> https_server = GoodCertServer(); - ASSERT_TRUE(https_server.get() != NULL); - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_.Start()); ui_test_utils::NavigateToURL(browser(), - https_server->TestServerPage("files/ssl/blank_page.html")); + https_server_.GetURL("files/ssl/blank_page.html")); TabContents* tab1 = browser()->GetSelectedTabContents(); @@ -528,7 +481,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecureContentTwoTabs) { // Create a new tab. GURL url = - https_server->TestServerPage("files/ssl/page_runs_insecure_content.html"); + https_server_.GetURL("files/ssl/page_runs_insecure_content.html"); TabContents* tab2 = browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, 0, TabStripModel::ADD_SELECTED, tab1->GetSiteInstance(), std::string(), NULL); @@ -546,19 +499,17 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecureContentTwoTabs) { // referencing that same image over http (hoping it is coming from the webcore // memory cache). IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysCachedInsecureContent) { - scoped_refptr<net::HTTPSTestServer> https_server = GoodCertServer(); - ASSERT_TRUE(https_server.get() != NULL); - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_.Start()); - ui_test_utils::NavigateToURL(browser(), http_server->TestServerPage( + ui_test_utils::NavigateToURL(browser(), test_server()->GetURL( "files/ssl/page_displays_insecure_content.html")); TabContents* tab = browser()->GetSelectedTabContents(); CheckUnauthenticatedState(tab); // Load again but over SSL. It should be marked as displaying insecure // content (even though the image comes from the WebCore memory cache). - ui_test_utils::NavigateToURL(browser(), https_server->TestServerPage( + ui_test_utils::NavigateToURL(browser(), https_server_.GetURL( "files/ssl/page_displays_insecure_content.html")); CheckAuthenticatedState(tab, true); } @@ -567,19 +518,17 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysCachedInsecureContent) { // referencing that same script over http (hoping it is coming from the webcore // memory cache). IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsCachedInsecureContent) { - scoped_refptr<net::HTTPSTestServer> https_server = GoodCertServer(); - ASSERT_TRUE(https_server.get() != NULL); - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_.Start()); ui_test_utils::NavigateToURL(browser(), - http_server->TestServerPage("files/ssl/page_runs_insecure_content.html")); + test_server()->GetURL("files/ssl/page_runs_insecure_content.html")); TabContents* tab = browser()->GetSelectedTabContents(); CheckUnauthenticatedState(tab); // Load again but over SSL. It should be marked as displaying insecure // content (even though the image comes from the WebCore memory cache). - ui_test_utils::NavigateToURL(browser(), https_server->TestServerPage( + ui_test_utils::NavigateToURL(browser(), https_server_.GetURL( "files/ssl/page_runs_insecure_content.html")); CheckAuthenticationBrokenState(tab, 0, true, false); } @@ -594,45 +543,32 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsCachedInsecureContent) { // This test ensures the CN invalid status does not 'stick' to a certificate // (see bug #1044942) and that it depends on the host-name. IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestCNInvalidStickiness) { - const std::string kLocalHost = "localhost"; - scoped_refptr<net::HTTPSTestServer> https_server = - net::HTTPSTestServer::CreateMismatchedServer(kDocRoot); - ASSERT_TRUE(https_server.get() != NULL); + ASSERT_TRUE(https_server_.Start()); + ASSERT_TRUE(https_server_mismatched_.Start()); // First we hit the server with hostname, this generates an invalid policy // error. ui_test_utils::NavigateToURL(browser(), - https_server->TestServerPage("files/ssl/google.html")); + https_server_mismatched_.GetURL("files/ssl/google.html")); // We get an interstitial page as a result. TabContents* tab = browser()->GetSelectedTabContents(); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_COMMON_NAME_INVALID, false, true); // Interstitial showing. - ProceedThroughInterstitial(tab); - CheckAuthenticationBrokenState(tab, net::CERT_STATUS_COMMON_NAME_INVALID, false, false); // No interstitial showing. // Now we try again with the right host name this time. - - // Let's change the host-name in the url. - GURL url = https_server->TestServerPage("files/ssl/google.html"); - std::string::size_type hostname_index = url.spec().find(kLocalHost); - ASSERT_TRUE(hostname_index != std::string::npos); // Test sanity check. - std::string new_url; - new_url.append(url.spec().substr(0, hostname_index)); - new_url.append(net::TestServerLauncher::kHostName); - new_url.append(url.spec().substr(hostname_index + kLocalHost.size())); - - ui_test_utils::NavigateToURL(browser(), GURL(new_url)); + GURL url(https_server_.GetURL("files/ssl/google.html")); + ui_test_utils::NavigateToURL(browser(), url); // Security state should be OK. CheckAuthenticatedState(tab, false); // Now try again the broken one to make sure it is still broken. ui_test_utils::NavigateToURL(browser(), - https_server->TestServerPage("files/ssl/google.html")); + https_server_mismatched_.GetURL("files/ssl/google.html")); // Since we OKed the interstitial last time, we get right to the page. CheckAuthenticationBrokenState(tab, net::CERT_STATUS_COMMON_NAME_INVALID, @@ -641,11 +577,10 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestCNInvalidStickiness) { // Test that navigating to a #ref does not change a bad security state. IN_PROC_BROWSER_TEST_F(SSLUITest, TestRefNavigation) { - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(https_server_expired_.Start()); ui_test_utils::NavigateToURL(browser(), - bad_https_server->TestServerPage("files/ssl/page_with_refs.html")); + https_server_expired_.GetURL("files/ssl/page_with_refs.html")); TabContents* tab = browser()->GetSelectedTabContents(); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, @@ -659,7 +594,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRefNavigation) { // Now navigate to a ref in the page, the security state should not have // changed. ui_test_utils::NavigateToURL(browser(), - bad_https_server->TestServerPage("files/ssl/page_with_refs.html#jp")); + https_server_expired_.GetURL("files/ssl/page_with_refs.html#jp")); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, false); // No interstitial showing. @@ -670,13 +605,11 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRefNavigation) { // TODO(jcampan): http://crbug.com/2136 disabled because the popup is not // opened as it is not initiated by a user gesture. IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) { - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_expired_.Start()); ui_test_utils::NavigateToURL(browser(), - http_server->TestServerPage("files/ssl/page_with_unsafe_popup.html")); + test_server()->GetURL("files/ssl/page_with_unsafe_popup.html")); TabContents* tab1 = browser()->GetSelectedTabContents(); // It is probably overkill to add a notification for a popup-opening, let's @@ -692,8 +625,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) { // Let's add another tab to make sure the browser does not exit when we close // the first tab. - GURL url = http_server->TestServerPage("files/ssl/google.html"); Browser* browser_used = NULL; + GURL url = test_server()->GetURL("files/ssl/google.html"); TabContents* tab2 = browser()->AddTabWithURL( url, GURL(), PageTransition::TYPED, 0, TabStripModel::ADD_SELECTED, NULL, std::string(), &browser_used); @@ -709,13 +642,11 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) { // Visit a page over bad https that is a redirect to a page with good https. // Marked as flaky, see bug 40932. IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectBadToGoodHTTPS) { - scoped_refptr<net::HTTPSTestServer> good_https_server = GoodCertServer(); - ASSERT_TRUE(good_https_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(https_server_.Start()); + ASSERT_TRUE(https_server_expired_.Start()); - GURL url1 = bad_https_server->TestServerPage("server-redirect?"); - GURL url2 = good_https_server->TestServerPage("files/ssl/google.html"); + GURL url1 = https_server_expired_.GetURL("server-redirect?"); + GURL url2 = https_server_.GetURL("files/ssl/google.html"); ui_test_utils::NavigateToURL(browser(), GURL(url1.spec() + url2.spec())); @@ -733,13 +664,11 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectBadToGoodHTTPS) { // Visit a page over good https that is a redirect to a page with bad https. // Marked as flaky, see bug 40932. IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectGoodToBadHTTPS) { - scoped_refptr<net::HTTPSTestServer> good_https_server = GoodCertServer(); - ASSERT_TRUE(good_https_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(https_server_.Start()); + ASSERT_TRUE(https_server_expired_.Start()); - GURL url1 = good_https_server->TestServerPage("server-redirect?"); - GURL url2 = bad_https_server->TestServerPage("files/ssl/google.html"); + GURL url1 = https_server_.GetURL("server-redirect?"); + GURL url2 = https_server_expired_.GetURL("files/ssl/google.html"); ui_test_utils::NavigateToURL(browser(), GURL(url1.spec() + url2.spec())); TabContents* tab = browser()->GetSelectedTabContents(); @@ -754,17 +683,15 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectGoodToBadHTTPS) { // Visit a page over http that is a redirect to a page with good HTTPS. IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectHTTPToGoodHTTPS) { - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> good_https_server = GoodCertServer(); - ASSERT_TRUE(good_https_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_.Start()); TabContents* tab = browser()->GetSelectedTabContents(); // HTTP redirects to good HTTPS. - GURL http_url = http_server->TestServerPage("server-redirect?"); + GURL http_url = test_server()->GetURL("server-redirect?"); GURL good_https_url = - good_https_server->TestServerPage("files/ssl/google.html"); + https_server_.GetURL("files/ssl/google.html"); ui_test_utils::NavigateToURL(browser(), GURL(http_url.spec() + good_https_url.spec())); @@ -773,16 +700,14 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectHTTPToGoodHTTPS) { // Visit a page over http that is a redirect to a page with bad HTTPS. IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectHTTPToBadHTTPS) { - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_expired_.Start()); TabContents* tab = browser()->GetSelectedTabContents(); - GURL http_url = http_server->TestServerPage("server-redirect?"); + GURL http_url = test_server()->GetURL("server-redirect?"); GURL bad_https_url = - bad_https_server->TestServerPage("files/ssl/google.html"); + https_server_expired_.GetURL("files/ssl/google.html"); ui_test_utils::NavigateToURL(browser(), GURL(http_url.spec() + bad_https_url.spec())); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, @@ -798,13 +723,11 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectHTTPToBadHTTPS) { // we don't keep the secure state). // Marked as flaky, see bug 40932. IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectHTTPSToHTTP) { - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> https_server = GoodCertServer(); - ASSERT_TRUE(https_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_.Start()); - GURL https_url = https_server->TestServerPage("server-redirect?"); - GURL http_url = http_server->TestServerPage("files/ssl/google.html"); + GURL https_url = https_server_.GetURL("server-redirect?"); + GURL http_url = test_server()->GetURL("files/ssl/google.html"); ui_test_utils::NavigateToURL(browser(), GURL(https_url.spec() + http_url.spec())); @@ -833,16 +756,13 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestConnectToBadPort) { // - navigate to HTTP (expect insecure content), then back // Disabled, http://crbug.com/18626. IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestGoodFrameNavigation) { - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> good_https_server = GoodCertServer(); - ASSERT_TRUE(good_https_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_.Start()); + ASSERT_TRUE(https_server_expired_.Start()); TabContents* tab = browser()->GetSelectedTabContents(); ui_test_utils::NavigateToURL(browser(), - good_https_server->TestServerPage("files/ssl/top_frame.html")); + https_server_.GetURL("files/ssl/top_frame.html")); CheckAuthenticatedState(tab, false); @@ -905,14 +825,12 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestGoodFrameNavigation) { // - navigate to an OK HTTPS frame (expected to be still authentication broken). // Marked as flaky, see bug 40932. IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestBadFrameNavigation) { - scoped_refptr<net::HTTPSTestServer> good_https_server = GoodCertServer(); - ASSERT_TRUE(good_https_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(https_server_.Start()); + ASSERT_TRUE(https_server_expired_.Start()); TabContents* tab = browser()->GetSelectedTabContents(); ui_test_utils::NavigateToURL(browser(), - bad_https_server->TestServerPage("files/ssl/top_frame.html")); + https_server_expired_.GetURL("files/ssl/top_frame.html")); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, true); // Interstitial showing @@ -944,16 +862,13 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestBadFrameNavigation) { FLAKY_TestUnauthenticatedFrameNavigation #endif IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestUnauthenticatedFrameNavigation) { - scoped_refptr<net::HTTPTestServer> http_server = PlainServer(); - ASSERT_TRUE(http_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> good_https_server = GoodCertServer(); - ASSERT_TRUE(good_https_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(https_server_.Start()); + ASSERT_TRUE(https_server_expired_.Start()); TabContents* tab = browser()->GetSelectedTabContents(); ui_test_utils::NavigateToURL(browser(), - http_server->TestServerPage("files/ssl/top_frame.html")); + test_server()->GetURL("files/ssl/top_frame.html")); CheckUnauthenticatedState(tab); // Now navigate inside the frame to a secure HTTPS frame. @@ -992,14 +907,12 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestUnauthenticatedFrameNavigation) { // Marked as flaky, see bug 40932. IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContentsInWorkerFiltered) { - scoped_refptr<net::HTTPSTestServer> good_https_server = GoodCertServer(); - ASSERT_TRUE(good_https_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(https_server_.Start()); + ASSERT_TRUE(https_server_expired_.Start()); // This page will spawn a Worker which will try to load content from // BadCertServer. - ui_test_utils::NavigateToURL(browser(), good_https_server->TestServerPage( + ui_test_utils::NavigateToURL(browser(), https_server_.GetURL( "files/ssl/page_with_unsafe_worker.html")); TabContents* tab = browser()->GetSelectedTabContents(); // Expect Worker not to load insecure content. @@ -1010,15 +923,13 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContentsInWorkerFiltered) { // Marked as flaky, see bug 40932. IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContentsInWorker) { - scoped_refptr<net::HTTPSTestServer> good_https_server = GoodCertServer(); - ASSERT_TRUE(good_https_server.get() != NULL); - scoped_refptr<net::HTTPSTestServer> bad_https_server = BadCertServer(); - ASSERT_TRUE(bad_https_server.get() != NULL); + ASSERT_TRUE(https_server_.Start()); + ASSERT_TRUE(https_server_expired_.Start()); // Navigate to an unsafe site. Proceed with interstitial page to indicate // the user approves the bad certificate. ui_test_utils::NavigateToURL(browser(), - bad_https_server->TestServerPage("files/ssl/blank_page.html")); + https_server_expired_.GetURL("files/ssl/blank_page.html")); TabContents* tab = browser()->GetSelectedTabContents(); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, true); // Interstitial showing @@ -1029,7 +940,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContentsInWorker) { // Navigate to safe page that has Worker loading unsafe content. // Expect content to load but be marked as auth broken due to running insecure // content. - ui_test_utils::NavigateToURL(browser(), good_https_server->TestServerPage( + ui_test_utils::NavigateToURL(browser(), https_server_.GetURL( "files/ssl/page_with_unsafe_worker.html")); CheckWorkerLoadResult(tab, true); // Worker loads insecure content CheckAuthenticationBrokenState(tab, 0, true, false); diff --git a/chrome/browser/sync/glue/http_bridge_unittest.cc b/chrome/browser/sync/glue/http_bridge_unittest.cc index 4d065f4..db87c81 100644 --- a/chrome/browser/sync/glue/http_bridge_unittest.cc +++ b/chrome/browser/sync/glue/http_bridge_unittest.cc @@ -15,7 +15,7 @@ using browser_sync::HttpBridge; namespace { // TODO(timsteele): Should use PathService here. See Chromium Issue 3113. -const wchar_t kDocRoot[] = L"chrome/test/data"; +const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); } // Lazy getter for TestURLRequestContext instances. @@ -39,7 +39,8 @@ class TestURLRequestContextGetter : public URLRequestContextGetter { class HttpBridgeTest : public testing::Test { public: HttpBridgeTest() - : fake_default_request_context_getter_(NULL), + : test_server_(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)), + fake_default_request_context_getter_(NULL), io_thread_(ChromeThread::IO) { } @@ -88,6 +89,8 @@ class HttpBridgeTest : public testing::Test { return fake_default_request_context_getter_; } + net::TestServer test_server_; + private: // A make-believe "default" request context, as would be returned by // Profile::GetDefaultRequestContext(). Created lazily by BuildBridge. @@ -175,14 +178,12 @@ TEST_F(HttpBridgeTest, TestMakeSynchronousPostShunted) { // Full round-trip test of the HttpBridge, using default UA string and // no request cookies. TEST_F(HttpBridgeTest, TestMakeSynchronousPostLiveWithPayload) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); scoped_refptr<HttpBridge> http_bridge(BuildBridge()); std::string payload = "this should be echoed back"; - GURL echo = server->TestServerPage("echo"); + GURL echo = test_server_.GetURL("echo"); http_bridge->SetURL(echo.spec().c_str(), echo.IntPort()); http_bridge->SetPostPayload("application/x-www-form-urlencoded", payload.length() + 1, payload.c_str()); @@ -200,12 +201,11 @@ TEST_F(HttpBridgeTest, TestMakeSynchronousPostLiveWithPayload) { // Full round-trip test of the HttpBridge, using custom UA string TEST_F(HttpBridgeTest, TestMakeSynchronousPostLiveComprehensive) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); + scoped_refptr<HttpBridge> http_bridge(BuildBridge()); - GURL echo_header = server->TestServerPage("echoall"); + GURL echo_header = test_server_.GetURL("echoall"); http_bridge->SetUserAgent("bob"); http_bridge->SetURL(echo_header.spec().c_str(), echo_header.IntPort()); @@ -228,12 +228,11 @@ TEST_F(HttpBridgeTest, TestMakeSynchronousPostLiveComprehensive) { } TEST_F(HttpBridgeTest, TestExtraRequestHeaders) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); + scoped_refptr<HttpBridge> http_bridge(BuildBridge()); - GURL echo_header = server->TestServerPage("echoall"); + GURL echo_header = test_server_.GetURL("echoall"); http_bridge->SetURL(echo_header.spec().c_str(), echo_header.IntPort()); http_bridge->SetExtraRequestHeaders("test:fnord"); @@ -257,12 +256,11 @@ TEST_F(HttpBridgeTest, TestExtraRequestHeaders) { } TEST_F(HttpBridgeTest, TestResponseHeader) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); + scoped_refptr<HttpBridge> http_bridge(BuildBridge()); - GURL echo_header = server->TestServerPage("echoall"); + GURL echo_header = test_server_.GetURL("echoall"); http_bridge->SetURL(echo_header.spec().c_str(), echo_header.IntPort()); std::string test_payload = "###TEST PAYLOAD###"; diff --git a/chrome/browser/tab_contents/view_source_uitest.cc b/chrome/browser/tab_contents/view_source_uitest.cc index 41cd428..654b747 100644 --- a/chrome/browser/tab_contents/view_source_uitest.cc +++ b/chrome/browser/tab_contents/view_source_uitest.cc @@ -11,11 +11,13 @@ namespace { -const wchar_t kDocRoot[] = L"chrome/test/data"; +const char kTestHtml[] = "files/viewsource/test.html"; class ViewSourceTest : public UITest { protected: - ViewSourceTest() : test_html_("files/viewsource/test.html") { + ViewSourceTest() + : test_server_(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { } bool IsMenuCommandEnabled(int command) { @@ -30,22 +32,21 @@ class ViewSourceTest : public UITest { } protected: - std::string test_html_; + net::TestServer test_server_; }; // This test renders a page in view-source and then checks to see if a cookie // set in the html was set successfully (it shouldn't because we rendered the // page in view source) TEST_F(ViewSourceTest, DoesBrowserRenderInViewSource) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); + std::string cookie = "viewsource_cookie"; std::string cookie_data = "foo"; // First we navigate to our view-source test page. GURL url(chrome::kViewSourceScheme + std::string(":") + - server->TestServerPage(test_html_).spec()); + test_server_.GetURL(kTestHtml).spec()); scoped_refptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab.get()); ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(url)); @@ -62,12 +63,10 @@ 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) TEST_F(ViewSourceTest, DoesBrowserConsumeViewSourcePrefix) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); // First we navigate to google.html. - GURL url(server->TestServerPage(test_html_)); + GURL url(test_server_.GetURL(kTestHtml)); NavigateToURL(url); // Then we navigate to the same url but with the "view-source:" prefix. @@ -82,11 +81,9 @@ TEST_F(ViewSourceTest, DoesBrowserConsumeViewSourcePrefix) { // Make sure that when looking at the actual page, we can select "View Source" // from the menu. TEST_F(ViewSourceTest, ViewSourceInMenuEnabledOnANormalPage) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); - GURL url(server->TestServerPage(test_html_)); + GURL url(test_server_.GetURL(kTestHtml)); NavigateToURL(url); EXPECT_TRUE(IsMenuCommandEnabled(IDC_VIEW_SOURCE)); @@ -95,12 +92,10 @@ TEST_F(ViewSourceTest, ViewSourceInMenuEnabledOnANormalPage) { // Make sure that when looking at the page source, we can't select "View Source" // from the menu. TEST_F(ViewSourceTest, ViewSourceInMenuDisabledWhileViewingSource) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server_.Start()); GURL url_viewsource(chrome::kViewSourceScheme + std::string(":") + - server->TestServerPage(test_html_).spec()); + test_server_.GetURL(kTestHtml).spec()); NavigateToURL(url_viewsource); EXPECT_FALSE(IsMenuCommandEnabled(IDC_VIEW_SOURCE)); diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index 7c2c9da..fcd73fb 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -455,12 +455,12 @@ TEST_F(TabRestoreUITest, FLAKY_RestoreIntoSameWindow) { // Tests that a duplicate history entry is not created when we restore a page // to an existing SiteInstance. (Bug 1230446) TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) { - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); - GURL http_url1(server->TestServerPage("files/title1.html")); - GURL http_url2(server->TestServerPage("files/title2.html")); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); + + GURL http_url1(test_server.GetURL("files/title1.html")); + GURL http_url2(test_server.GetURL("files/title2.html")); scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser_proxy.get()); @@ -502,12 +502,12 @@ TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) { // are given appropriate max page IDs, even if the renderer for the entry // already exists. (Bug 1204135) TEST_F(TabRestoreUITest, RestoreCrossSiteWithExistingSiteInstance) { - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); - GURL http_url1(server->TestServerPage("files/title1.html")); - GURL http_url2(server->TestServerPage("files/title2.html")); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); + + GURL http_url1(test_server.GetURL("files/title1.html")); + GURL http_url2(test_server.GetURL("files/title2.html")); scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser_proxy.get()); @@ -644,11 +644,11 @@ TEST_F(TabRestoreUITest, 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 TEST_F(TabRestoreUITest, RestoreTabWithSpecialURLOnBack) { - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(server.get()); - const GURL http_url(server->TestServerPage("files/title1.html")); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); + + const GURL http_url(test_server.GetURL("files/title1.html")); scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); diff --git a/chrome/browser/views/find_bar_host_interactive_uitest.cc b/chrome/browser/views/find_bar_host_interactive_uitest.cc index 991338c..f866f09 100644 --- a/chrome/browser/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/views/find_bar_host_interactive_uitest.cc @@ -24,7 +24,6 @@ namespace { // The delay waited after sending an OS simulated event. static const int kActionDelayMs = 500; -static const wchar_t kDocRoot[] = L"chrome/test/data"; static const char kSimplePage[] = "files/find_in_page/simple.html"; class FindInPageTest : public InProcessBrowserTest { @@ -89,12 +88,10 @@ class FindInPageTest : public InProcessBrowserTest { } // namespace IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server()->Start()); // First we navigate to our test page (tab A). - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); browser()->Find(); @@ -130,11 +127,9 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) { } IN_PROC_BROWSER_TEST_F(FindInPageTest, FocusRestore) { - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(NULL != server.get()); + ASSERT_TRUE(test_server()->Start()); - GURL url = server->TestServerPage("title1.html"); + GURL url = test_server()->GetURL("title1.html"); ui_test_utils::NavigateToURL(browser(), url); // Focus the location bar, open and close the find-in-page, focus should @@ -180,11 +175,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, PrepopulateRespectBlank) { return; #endif - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server); + ASSERT_TRUE(test_server()->Start()); // First we navigate to any page. - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server()->GetURL(kSimplePage); ui_test_utils::NavigateToURL(browser(), url); gfx::NativeWindow window = browser()->window()->GetNativeHandle(); diff --git a/chrome/browser/views/find_bar_host_uitest.cc b/chrome/browser/views/find_bar_host_uitest.cc index a8a88ba..df4ea0e 100644 --- a/chrome/browser/views/find_bar_host_uitest.cc +++ b/chrome/browser/views/find_bar_host_uitest.cc @@ -25,11 +25,11 @@ const std::string kSimplePage = "404_is_enough_for_us.html"; // The find window should not change its location just because we open and close // a new tab. TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) { - scoped_refptr<net::HTTPTestServer> server = - net::HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); - GURL url = server->TestServerPage(kSimplePage); + GURL url = test_server.GetURL(kSimplePage); scoped_refptr<TabProxy> tabA(GetActiveTab()); ASSERT_TRUE(tabA.get()); ASSERT_TRUE(tabA->NavigateToURL(url)); |