diff options
| -rw-r--r-- | chrome/browser/chromeos/login/account_screen_browsertest.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/file_browse_browsertest.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/mediaplayer_browsertest.cc | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/login/account_screen_browsertest.cc b/chrome/browser/chromeos/login/account_screen_browsertest.cc index e43781b..2f4c940 100644 --- a/chrome/browser/chromeos/login/account_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/account_screen_browsertest.cc @@ -28,9 +28,8 @@ class AccountScreenTest : public WizardInProcessBrowserTest { protected: // Overridden from WizardInProcessBrowserTest: virtual void SetUpWizard() { - net::HTTPTestServer* server = StartHTTPServer(); - ASSERT_TRUE(server != NULL); - GURL new_account_page_url(server->TestServerPage("files/new_account.html")); + ASSERT_TRUE(test_server()->Start()); + GURL new_account_page_url(test_server()->GetURL("files/new_account.html")); AccountScreen::set_new_account_page_url(new_account_page_url); AccountScreen::set_check_for_https(false); } diff --git a/chrome/browser/dom_ui/file_browse_browsertest.cc b/chrome/browser/dom_ui/file_browse_browsertest.cc index a514536..c8d7a1f 100644 --- a/chrome/browser/dom_ui/file_browse_browsertest.cc +++ b/chrome/browser/dom_ui/file_browse_browsertest.cc @@ -103,9 +103,9 @@ class FileBrowseUiObserver : public NotificationObserver { }; IN_PROC_BROWSER_TEST_F(FileBrowseBrowserTest, InputFileTriggerFileBrowse) { - net::HTTPTestServer* server = StartHTTPServer(); + ASSERT_TRUE(test_server()->Start()); ui_test_utils::NavigateToURL(browser(), - server->TestServerPage("files/input_file.html")); + test_server()->GetURL("files/input_file.html")); DOMElementProxyRef doc = ui_test_utils::GetActiveDOMDocument(browser()); diff --git a/chrome/browser/dom_ui/mediaplayer_browsertest.cc b/chrome/browser/dom_ui/mediaplayer_browsertest.cc index e1d7263..0ca380f 100644 --- a/chrome/browser/dom_ui/mediaplayer_browsertest.cc +++ b/chrome/browser/dom_ui/mediaplayer_browsertest.cc @@ -60,7 +60,7 @@ class MediaPlayerBrowserTest : public InProcessBrowserTest { }; IN_PROC_BROWSER_TEST_F(MediaPlayerBrowserTest, Popup) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); // Doing this so we have a valid profile. ui_test_utils::NavigateToURL(browser(), GURL("chrome://downloads")); @@ -78,7 +78,7 @@ IN_PROC_BROWSER_TEST_F(MediaPlayerBrowserTest, Popup) { } IN_PROC_BROWSER_TEST_F(MediaPlayerBrowserTest, PopupPlaylist) { - ASSERT_TRUE(StartHTTPServer()); + ASSERT_TRUE(test_server()->Start()); // Doing this so we have a valid profile. ui_test_utils::NavigateToURL(browser(), GURL("chrome://downloads")); |