diff options
Diffstat (limited to 'chrome')
19 files changed, 222 insertions, 375 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index 160c3ab..ca89162 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -55,12 +55,10 @@ bool ActivateTabByClick(AutomationProxy* automation, } // namespace TEST_F(BrowserFocusTest, BrowsersRememberFocus) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // First we navigate to our test page. - GURL url = server->TestServerPageW(kSimplePage); + GURL url = server.TestServerPageW(kSimplePage); scoped_ptr<TabProxy> tab(GetActiveTab()); EXPECT_NE(AUTOMATION_MSG_NAVIGATION_ERROR, tab->NavigateToURL(url)); @@ -132,9 +130,7 @@ TEST_F(BrowserFocusTest, BrowsersRememberFocus) { // Tabs remember focus. TEST_F(BrowserFocusTest, TabsRememberFocus) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); scoped_ptr<WindowProxy> window(automation()->GetActiveWindow()); ASSERT_TRUE(window.get() != NULL); @@ -143,7 +139,7 @@ TEST_F(BrowserFocusTest, TabsRememberFocus) { ASSERT_TRUE(browser.get() != NULL); // First we navigate to our test page. - GURL url = server->TestServerPageW(kSimplePage); + GURL url = server.TestServerPageW(kSimplePage); scoped_ptr<TabProxy> tab(GetActiveTab()); tab->NavigateToURL(url); @@ -198,12 +194,10 @@ TEST_F(BrowserFocusTest, TabsRememberFocus) { // Background window does not steal focus. TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // First we navigate to our test page. - GURL simple_page_url = server->TestServerPageW(kSimplePage); + GURL simple_page_url = server.TestServerPageW(kSimplePage); scoped_ptr<TabProxy> tab(GetActiveTab()); tab->NavigateToURL(simple_page_url); @@ -221,7 +215,7 @@ TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) { automation()->GetBrowserForWindow(new_window.get())); ASSERT_TRUE(new_browser.get() != NULL); - GURL steal_focus_url = server->TestServerPageW(kStealFocusPage); + GURL steal_focus_url = server.TestServerPageW(kStealFocusPage); new_browser->AppendTab(steal_focus_url); // Make the first browser active @@ -238,12 +232,10 @@ TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) { // Page cannot steal focus when focus is on location bar. TEST_F(BrowserFocusTest, LocationBarLockFocus) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // Open the page that steals focus. - GURL url = server->TestServerPageW(kStealFocusPage); + GURL url = server.TestServerPageW(kStealFocusPage); scoped_ptr<TabProxy> tab(GetActiveTab()); tab->NavigateToURL(url); @@ -272,12 +264,10 @@ TEST_F(BrowserFocusTest, LocationBarLockFocus) { // Focus traversal TEST_F(BrowserFocusTest, FocusTraversal) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // Open the page the test page. - GURL url = server->TestServerPageW(kTypicalPage); + GURL url = server.TestServerPageW(kTypicalPage); scoped_ptr<TabProxy> tab(GetActiveTab()); tab->NavigateToURL(url); @@ -347,12 +337,10 @@ TEST_F(BrowserFocusTest, FocusTraversal) { // Make sure Find box can request focus, even when it is already open. TEST_F(BrowserFocusTest, FindFocusTest) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // Open some page (any page that doesn't steal focus). - GURL url = server->TestServerPageW(kTypicalPage); + GURL url = server.TestServerPageW(kTypicalPage); scoped_ptr<TabProxy> tab(GetActiveTab()); tab->NavigateToURL(url); diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc index 237c0bd..f4ca495 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/browser_uitest.cc @@ -240,9 +240,7 @@ TEST_F(BrowserTest, NullOpenerRedirectForksProcess) { return; const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); std::wstring test_file(test_data_directory_); scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0)); scoped_ptr<TabProxy> tab(window->GetActiveTab()); @@ -280,9 +278,7 @@ TEST_F(BrowserTest, OtherRedirectsDontForkProcess) { return; const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); std::wstring test_file(test_data_directory_); scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0)); scoped_ptr<TabProxy> tab(window->GetActiveTab()); diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc index a071fb2..ec63430 100644 --- a/chrome/browser/errorpage_uitest.cc +++ b/chrome/browser/errorpage_uitest.cc @@ -38,10 +38,8 @@ 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<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); - GURL test_url = server->TestServerPage("files/iframe404.html"); + TestServer server(L"chrome/test/data"); + GURL test_url = server.TestServerPage("files/iframe404.html"); NavigateToURL(test_url); // Verify that the url is in the title. Since it's set via Javascript, we diff --git a/chrome/browser/history/redirect_uitest.cc b/chrome/browser/history/redirect_uitest.cc index 4002500..272c59a 100644 --- a/chrome/browser/history/redirect_uitest.cc +++ b/chrome/browser/history/redirect_uitest.cc @@ -30,12 +30,10 @@ class RedirectTest : public UITest { // Tests a single server redirect TEST_F(RedirectTest, Server) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); - GURL final_url = server->TestServerPageW(std::wstring()); - GURL first_url = server->TestServerPageW( + GURL final_url = server.TestServerPageW(std::wstring()); + GURL first_url = server.TestServerPageW( std::wstring(L"server-redirect?") + UTF8ToWide(final_url.spec())); NavigateToURL(first_url); @@ -52,12 +50,10 @@ TEST_F(RedirectTest, Server) { // Tests a single client redirect. TEST_F(RedirectTest, Client) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); - GURL final_url = server->TestServerPageW(std::wstring()); - GURL first_url = server->TestServerPageW( + GURL final_url = server.TestServerPageW(std::wstring()); + GURL first_url = server.TestServerPageW( std::wstring(L"client-redirect?") + UTF8ToWide(final_url.spec())); // We need the sleep for the client redirects, because it appears as two @@ -76,32 +72,30 @@ TEST_F(RedirectTest, Client) { } TEST_F(RedirectTest, ClientEmptyReferer) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - - GURL final_url = server->TestServerPageW(std::wstring()); - std::wstring test_file = test_data_directory_; - file_util::AppendToPath(&test_file, L"file_client_redirect.html"); - GURL first_url = net::FilePathToFileURL(test_file); - - NavigateToURL(first_url); - std::vector<GURL> redirects; - // We need the sleeps for the client redirects, because it appears as two - // page visits in the browser. And note for this test the browser actually - // loads the html file on disk, rather than just getting a response from - // the TestServer. - for (int i = 0; i < 10; ++i) { - Sleep(kWaitForActionMaxMsec / 10); - scoped_ptr<TabProxy> tab_proxy(GetActiveTab()); - ASSERT_TRUE(tab_proxy.get()); - ASSERT_TRUE(tab_proxy->GetRedirectsFrom(first_url, &redirects)); - if (!redirects.empty()) - break; - } + TestServer server(kDocRoot); + + GURL final_url = server.TestServerPageW(std::wstring()); + std::wstring test_file = test_data_directory_; + file_util::AppendToPath(&test_file, L"file_client_redirect.html"); + GURL first_url = net::FilePathToFileURL(test_file); + + NavigateToURL(first_url); + std::vector<GURL> redirects; + // We need the sleeps for the client redirects, because it appears as two + // page visits in the browser. And note for this test the browser actually + // loads the html file on disk, rather than just getting a response from + // the TestServer. + for (int i = 0; i < 10; ++i) { + Sleep(kWaitForActionMaxMsec / 10); + scoped_ptr<TabProxy> tab_proxy(GetActiveTab()); + ASSERT_TRUE(tab_proxy.get()); + ASSERT_TRUE(tab_proxy->GetRedirectsFrom(first_url, &redirects)); + if (!redirects.empty()) + break; + } - EXPECT_EQ(1, redirects.size()); - EXPECT_EQ(final_url.spec(), redirects[0].spec()); + EXPECT_EQ(1, redirects.size()); + EXPECT_EQ(final_url.spec(), redirects[0].spec()); } // Tests to make sure a location change when a pending redirect exists isn't @@ -142,16 +136,14 @@ TEST_F(RedirectTest, ClientCancelled) { // TODO(creis): This is disabled temporarily while I figure out why it is // failing. TEST_F(RedirectTest, DISABLED_ClientServerServer) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); - GURL final_url = server->TestServerPageW(std::wstring()); - GURL next_to_last = server->TestServerPageW( + GURL final_url = server.TestServerPageW(std::wstring()); + GURL next_to_last = server.TestServerPageW( std::wstring(L"server-redirect?") + UTF8ToWide(final_url.spec())); - GURL second_url = server->TestServerPageW( + GURL second_url = server.TestServerPageW( std::wstring(L"server-redirect?") + UTF8ToWide(next_to_last.spec())); - GURL first_url = server->TestServerPageW( + GURL first_url = server.TestServerPageW( std::wstring(L"client-redirect?") + UTF8ToWide(second_url.spec())); std::vector<GURL> redirects; @@ -176,14 +168,12 @@ TEST_F(RedirectTest, DISABLED_ClientServerServer) { // Tests that the "#reference" gets preserved across server redirects. TEST_F(RedirectTest, ServerReference) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); const std::string ref("reference"); - GURL final_url = server->TestServerPageW(std::wstring()); - GURL initial_url = server->TestServerPageW( + GURL final_url = server.TestServerPageW(std::wstring()); + GURL initial_url = server.TestServerPageW( std::wstring(L"server-redirect?") + UTF8ToWide(final_url.spec()) + L"#" + UTF8ToWide(ref)); @@ -197,14 +187,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<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); std::wstring test_file = test_data_directory_; file_util::AppendToPath(&test_file, L"http_to_file.html"); GURL file_url = net::FilePathToFileURL(test_file); - GURL initial_url = server->TestServerPageW( + GURL initial_url = server.TestServerPageW( std::wstring(L"client-redirect?") + UTF8ToWide(file_url.spec())); NavigateToURL(initial_url); @@ -220,10 +208,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<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - + TestServer server(kDocRoot); std::wstring test_file = test_data_directory_; file_util::AppendToPath(&test_file, L"ref_redirect.html"); GURL first_url = net::FilePathToFileURL(test_file); @@ -244,27 +229,24 @@ TEST_F(RedirectTest, ClientFragments) { } // TODO(timsteele): This is disabled because our current testserver can't -// handle multiple requests in parallel, making it hang on the first request -// to /slow?60. It's unable to serve our second request for files/title2.html -// until /slow? completes, which doesn't give the desired behavior. We could -// alternatively load the second page from disk, but we would need to start -// the browser for this testcase with --process-per-tab, and I don't think -// we can do this at test-case-level granularity at the moment. -TEST_F(RedirectTest, - DISABLED_ClientCancelledByNewNavigationAfterProvisionalLoad) { +// handle multiple requests in parallel, making it hang on the first request to +// /slow?60. It's unable to serve our second request for files/title2.html until +// /slow? completes, which doesn't give the desired behavior. We could +// alternatively load the second page from disk, but we would need to start the +// browser for this testcase with --process-per-tab, and I don't think we can do +// this at test-case-level granularity at the moment. +TEST_F(RedirectTest, DISABLED_ClientCancelledByNewNavigationAfterProvisionalLoad) { // We want to initiate a second navigation after the provisional load for // the client redirect destination has started, but before this load is // committed. To achieve this, we tell the browser to load a slow page, // 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<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - - GURL final_url = server->TestServerPageW(std::wstring(L"files/title2.html")); - GURL slow = server->TestServerPageW(std::wstring(L"slow?60")); - GURL first_url = server->TestServerPageW( + TestServer server(kDocRoot); + + GURL final_url = server.TestServerPageW(std::wstring(L"files/title2.html")); + GURL slow = server.TestServerPageW(std::wstring(L"slow?60")); + GURL first_url = server.TestServerPageW( std::wstring(L"client-redirect?") + UTF8ToWide(slow.spec())); std::vector<GURL> redirects; @@ -274,7 +256,7 @@ TEST_F(RedirectTest, // started it's provisional load for the client redirect destination page but // hasn't completed. Our time is now! NavigateToURL(final_url); - + std::wstring tab_title; std::wstring final_url_title = L"Title Of Awesomeness"; // Wait till the final page has been loaded. @@ -289,9 +271,9 @@ TEST_F(RedirectTest, } } - // Check to make sure the navigation did in fact take place and we are + // Check to make sure the navigation did in fact take place and we are // at the expected page. - EXPECT_EQ(final_url_title, tab_title); + EXPECT_EQ(final_url_title, tab_title); bool final_navigation_not_redirect = true; // Check to make sure our request for files/title2.html doesn't get flagged diff --git a/chrome/browser/interstitial_page_uitest.cc b/chrome/browser/interstitial_page_uitest.cc index c3d675c..a50908c9 100644 --- a/chrome/browser/interstitial_page_uitest.cc +++ b/chrome/browser/interstitial_page_uitest.cc @@ -52,13 +52,10 @@ class InterstitialPageTest : public UITest { // causes the actual navigation entry (title) to be modified by the content of // the interstitial. TEST_F(InterstitialPageTest, TestShowHideInterstitial) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - + TestServer server(kDocRoot); ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); NavigateTab(tab.get(), - server->TestServerPageW(L"files/interstitial_page/google.html")); + server.TestServerPageW(L"files/interstitial_page/google.html")); NavigationEntry::PageType page_type; EXPECT_TRUE(tab->GetPageType(&page_type)); EXPECT_EQ(NavigationEntry::NORMAL_PAGE, page_type); @@ -81,13 +78,10 @@ TEST_F(InterstitialPageTest, TestShowHideInterstitial) { // the interstitial. In the mean time, we are treating Back like cancelling // the interstitial, which breaks this test because no notification occurs. TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenBack) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - + TestServer server(kDocRoot); ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); NavigateTab(tab.get(), - server->TestServerPageW(L"files/interstitial_page/google.html")); + server.TestServerPageW(L"files/interstitial_page/google.html")); EXPECT_EQ(L"Google", GetActiveTabTitle()); tab->ShowInterstitialPage(kInterstitialPageHTMLText, action_timeout_ms()); @@ -100,31 +94,26 @@ TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenBack) { // Shows an interstitial page then navigates to a new URL. // Flacky on Windows 2000 bot. Disabled for now bug #1173138. TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenNavigate) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - + TestServer server(kDocRoot); ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); NavigateTab(tab.get(), - server->TestServerPageW(L"files/interstitial_page/google.html")); + server.TestServerPageW(L"files/interstitial_page/google.html")); EXPECT_EQ(L"Google", GetActiveTabTitle()); tab->ShowInterstitialPage(kInterstitialPageHTMLText, action_timeout_ms()); EXPECT_EQ(L"Interstitial page", GetActiveTabTitle()); tab->NavigateToURL( - server->TestServerPageW(L"files/interstitial_page/shopping.html")); + server.TestServerPageW(L"files/interstitial_page/shopping.html")); EXPECT_EQ(L"Google Product Search", GetActiveTabTitle()); } // Shows an interstitial page then closes the tab (to make sure we don't crash). TEST_F(InterstitialPageTest, TestShowInterstitialThenCloseTab) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // Create 2 tabs so closing one does not close the browser. - AppendTab(server->TestServerPageW(L"files/interstitial_page/google.html")); + AppendTab(server.TestServerPageW(L"files/interstitial_page/google.html")); ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); EXPECT_EQ(L"Google", GetActiveTabTitle()); @@ -137,13 +126,11 @@ TEST_F(InterstitialPageTest, TestShowInterstitialThenCloseTab) { // crash). // This test is disabled. See bug #1119448. TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenCloseBrowser) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); tab->NavigateToURL( - server->TestServerPageW(L"files/interstitial_page/google.html")); + server.TestServerPageW(L"files/interstitial_page/google.html")); EXPECT_EQ(L"Google", GetActiveTabTitle()); tab->ShowInterstitialPage(kInterstitialPageHTMLText, action_timeout_ms()); diff --git a/chrome/browser/login_prompt_uitest.cc b/chrome/browser/login_prompt_uitest.cc index 1d7d25c..3969ccf 100644 --- a/chrome/browser/login_prompt_uitest.cc +++ b/chrome/browser/login_prompt_uitest.cc @@ -62,11 +62,9 @@ wstring ExpectedTitleFromAuth(wstring username, wstring password) { // Test that "Basic" HTTP authentication works. TEST_F(LoginPromptTest, TestBasicAuth) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); - NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); + NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_FALSE(tab->SetAuth(username_basic_, password_bad_)); @@ -74,7 +72,7 @@ TEST_F(LoginPromptTest, TestBasicAuth) { EXPECT_TRUE(tab->CancelAuth()); EXPECT_EQ(L"Denied: wrong password", GetActiveTabTitle()); - NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); + NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_TRUE(tab->SetAuth(username_basic_, password_)); @@ -84,18 +82,16 @@ TEST_F(LoginPromptTest, TestBasicAuth) { // Test that "Digest" HTTP authentication works. TEST_F(LoginPromptTest, TestDigestAuth) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); - NavigateTab(tab.get(), server->TestServerPageW(L"auth-digest")); + NavigateTab(tab.get(), server.TestServerPageW(L"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()); - NavigateTab(tab.get(), server->TestServerPageW(L"auth-digest")); + NavigateTab(tab.get(), server.TestServerPageW(L"auth-digest")); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_TRUE(tab->SetAuth(username_digest_, password_)); @@ -105,16 +101,14 @@ TEST_F(LoginPromptTest, TestDigestAuth) { // Test that logging in on 2 tabs at once works. TEST_F(LoginPromptTest, TestTwoAuths) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); ::scoped_ptr<TabProxy> basic_tab(GetActiveTabProxy()); - NavigateTab(basic_tab.get(), server->TestServerPageW(L"auth-basic")); + NavigateTab(basic_tab.get(), server.TestServerPageW(L"auth-basic")); AppendTab(GURL("about:blank")); ::scoped_ptr<TabProxy> digest_tab(GetActiveTabProxy()); - NavigateTab(digest_tab.get(), server->TestServerPageW(L"auth-digest")); + NavigateTab(digest_tab.get(), server.TestServerPageW(L"auth-digest")); // TODO(devint): http://b/1158262 basic_tab is not active, so this logs in to // a page whose tab isn't active, which isn't actually possible for the user @@ -135,36 +129,34 @@ TEST_F(LoginPromptTest, TestTwoAuths) { // Test that cancelling authentication works. TEST_F(LoginPromptTest, TestCancelAuth) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); // First navigate to a test server page so we have something to go back to. - EXPECT_TRUE(tab->NavigateToURL(server->TestServerPageW(L"a"))); + EXPECT_TRUE(tab->NavigateToURL(server.TestServerPageW(L"a"))); // Navigating while auth is requested is the same as cancelling. - NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); + NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); EXPECT_TRUE(tab->NeedsAuth()); - EXPECT_TRUE(tab->NavigateToURL(server->TestServerPageW(L"b"))); + EXPECT_TRUE(tab->NavigateToURL(server.TestServerPageW(L"b"))); EXPECT_FALSE(tab->NeedsAuth()); - NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); + NavigateTab(tab.get(), server.TestServerPageW(L"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. - EXPECT_TRUE(tab->NavigateToURL(server->TestServerPageW(L"c"))); + EXPECT_TRUE(tab->NavigateToURL(server.TestServerPageW(L"c"))); EXPECT_TRUE(tab->GoBack()); // should bring us back to 'a' - NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); + NavigateTab(tab.get(), server.TestServerPageW(L"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. - NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); + NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_TRUE(tab->CancelAuth()); EXPECT_FALSE(tab->NeedsAuth()); diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc index 086c2b9..a8c5059 100644 --- a/chrome/browser/printing/printing_layout_uitest.cc +++ b/chrome/browser/printing/printing_layout_uitest.cc @@ -457,8 +457,7 @@ class DismissTheWindow : public base::RefCountedThreadSafe<DismissTheWindow> { dialog_window, WM_COMMAND, print_button_id, - reinterpret_cast<LPARAM>(GetDlgItem(dialog_window, - print_button_id))); + reinterpret_cast<LPARAM>(GetDlgItem(dialog_window, print_button_id))); // Try again. if (res) return; @@ -499,11 +498,8 @@ TEST_F(PrintingLayoutTextTest, DISABLED_Complex) { return; // Print a document, check its output. - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - - NavigateToURL(server->TestServerPage("files/printing/test1.html")); + TestServer server(kDocRoot); + NavigateToURL(server.TestServerPage("files/printing/test1.html")); PrintNowTab(); EXPECT_EQ(0., CompareWithResult(L"test1")); } @@ -528,16 +524,13 @@ TEST_F(PrintingLayoutTestHidden, ManyTimes) { if (IsTestCaseDisabled()) return; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - + TestServer server(kDocRoot); ASSERT_GT(arraysize(kTestPool), 0u); for (int i = 0; i < arraysize(kTestPool); ++i) { if (i) CleanupDumpDirectory(); const TestPool& test = kTestPool[i % arraysize(kTestPool)]; - NavigateToURL(server->TestServerPageW(test.source)); + NavigateToURL(server.TestServerPageW(test.source)); PrintNowTab(); EXPECT_EQ(0., CompareWithResult(test.result)) << test.result; CleanupDumpDirectory(); @@ -561,15 +554,13 @@ TEST_F(PrintingLayoutTest, DISABLED_Delayed) { if (win_util::GetWinVersion() < win_util::WINVERSION_XP) return; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); { scoped_ptr<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 = server.TestServerPage("files/printing/popup_delayed_print.htm"); EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab_proxy->NavigateToURL(url)); @@ -588,7 +579,7 @@ TEST_F(PrintingLayoutTest, DISABLED_Delayed) { worker->Stop(); // Force a navigation elsewhere to verify that it's fine with it. - url = server->TestServerPage("files/printing/test1.html"); + url = server.TestServerPage("files/printing/test1.html"); EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab_proxy->NavigateToURL(url)); } @@ -603,14 +594,12 @@ TEST_F(PrintingLayoutTest, DISABLED_IFrame) { if (IsTestCaseDisabled()) return; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); { scoped_ptr<TabProxy> tab_proxy(GetActiveTab()); ASSERT_TRUE(tab_proxy.get()); - GURL url = server->TestServerPage("files/printing/iframe.htm"); + GURL url = server.TestServerPage("files/printing/iframe.htm"); EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab_proxy->NavigateToURL(url)); @@ -628,7 +617,7 @@ TEST_F(PrintingLayoutTest, DISABLED_IFrame) { worker->Stop(); // Force a navigation elsewhere to verify that it's fine with it. - url = server->TestServerPage("files/printing/test1.html"); + url = server.TestServerPage("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 350e544..6d276ee 100644 --- a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc +++ b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc @@ -89,15 +89,12 @@ TEST_F(ResourceDispatcherTest, ContentDispositionInline) { // Test for bug #1091358. TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest) { const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); EXPECT_TRUE(browser_proxy.get()); scoped_ptr<TabProxy> tab(browser_proxy->GetActiveTab()); - tab->NavigateToURL(server->TestServerPageW( - L"files/sync_xmlhttprequest.html")); + tab->NavigateToURL(server.TestServerPageW(L"files/sync_xmlhttprequest.html")); // Let's check the XMLHttpRequest ran successfully. bool success = false; @@ -112,16 +109,14 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest) { // if executed while navigating to a new page. TEST_F(ResourceDispatcherTest, SyncXMLHttpRequestDuringUnload) { const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); EXPECT_TRUE(browser_proxy.get()); scoped_ptr<TabProxy> tab(browser_proxy->GetActiveTab()); tab->NavigateToURL( - server->TestServerPageW(L"files/sync_xmlhttprequest_during_unload.html")); + server.TestServerPageW(L"files/sync_xmlhttprequest_during_unload.html")); // Confirm that the page has loaded (since it changes its title during load). std::wstring tab_title; @@ -131,7 +126,7 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequestDuringUnload) { // Navigate to a new page, to dispatch unload event and trigger xhr. // (the bug would make this step hang the renderer). bool timed_out = false; - tab->NavigateToURLWithTimeout(server->TestServerPageW(L"files/title2.html"), + tab->NavigateToURLWithTimeout(server.TestServerPageW(L"files/title2.html"), kWaitForActionMaxMsec, &timed_out); EXPECT_FALSE(timed_out); @@ -147,15 +142,13 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequestDuringUnload) { // 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<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); EXPECT_TRUE(browser_proxy.get()); scoped_ptr<TabProxy> tab(browser_proxy->GetActiveTab()); - GURL url(server->TestServerPageW(L"files/onunload_cookie.html")); + GURL url(server.TestServerPageW(L"files/onunload_cookie.html")); tab->NavigateToURL(url); // Confirm that the page has loaded (since it changes its title during load). @@ -226,15 +219,13 @@ TEST_F(ResourceDispatcherTest, CrossSiteNavigationNonBuffered) { // away from the link doctor page. (Bug 1235537) TEST_F(ResourceDispatcherTest, CrossSiteNavigationErrorPage) { const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); EXPECT_TRUE(browser_proxy.get()); scoped_ptr<TabProxy> tab(browser_proxy->GetActiveTab()); - GURL url(server->TestServerPageW(L"files/onunload_cookie.html")); + GURL url(server.TestServerPageW(L"files/onunload_cookie.html")); tab->NavigateToURL(url); // Confirm that the page has loaded (since it changes its title during load). @@ -268,7 +259,7 @@ TEST_F(ResourceDispatcherTest, CrossSiteNavigationErrorPage) { // WebContents 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->TestServerPageW(L"files/title2.html")); + GURL test_url(server.TestServerPageW(L"files/title2.html")); std::wstring redirect_url = L"javascript:window.location='" + ASCIIToWide(test_url.possibly_invalid_spec()) + L"'"; tab->NavigateToURLAsync(GURL(redirect_url)); diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc index bc8fadc..251a3ba 100644 --- a/chrome/browser/session_history_uitest.cc +++ b/chrome/browser/session_history_uitest.cc @@ -107,24 +107,22 @@ class SessionHistoryTest : public UITest { } // namespace TEST_F(SessionHistoryTest, BasicBackForward) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // 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"))); + server.TestServerPage("files/session_history/bot1.html"))); EXPECT_EQ(L"bot1", GetTabTitle()); ASSERT_TRUE(tab_->NavigateToURL( - server->TestServerPage("files/session_history/bot2.html"))); + server.TestServerPage("files/session_history/bot2.html"))); EXPECT_EQ(L"bot2", GetTabTitle()); ASSERT_TRUE(tab_->NavigateToURL( - server->TestServerPage("files/session_history/bot3.html"))); + server.TestServerPage("files/session_history/bot3.html"))); EXPECT_EQ(L"bot3", GetTabTitle()); // history is [blank, bot1, bot2, *bot3] @@ -142,7 +140,7 @@ TEST_F(SessionHistoryTest, BasicBackForward) { EXPECT_EQ(L"bot1", GetTabTitle()); ASSERT_TRUE(tab_->NavigateToURL( - server->TestServerPage("files/session_history/bot3.html"))); + server.TestServerPage("files/session_history/bot3.html"))); EXPECT_EQ(L"bot3", GetTabTitle()); // history is [blank, bot1, *bot3] @@ -173,9 +171,7 @@ TEST_F(SessionHistoryTest, FrameBackForward) { if (win_util::GetWinVersion() <= win_util::WINVERSION_2000) return; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // about:blank should be loaded first. GURL home(homepage_); @@ -183,7 +179,7 @@ TEST_F(SessionHistoryTest, FrameBackForward) { EXPECT_EQ(L"", GetTabTitle()); EXPECT_EQ(home, GetTabURL()); - GURL frames(server->TestServerPage("files/session_history/frames.html")); + GURL frames(server.TestServerPage("files/session_history/frames.html")); ASSERT_TRUE(tab_->NavigateToURL(frames)); EXPECT_EQ(L"bot1", GetTabTitle()); EXPECT_EQ(frames, GetTabURL()); @@ -239,15 +235,13 @@ TEST_F(SessionHistoryTest, FrameBackForward) { // Test that back/forward preserves POST data and document state in subframes. TEST_F(SessionHistoryTest, FrameFormBackForward) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // 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(server.TestServerPage("files/session_history/frames.html")); ASSERT_TRUE(tab_->NavigateToURL(frames)); EXPECT_EQ(L"bot1", GetTabTitle()); @@ -301,15 +295,13 @@ TEST_F(SessionHistoryTest, FrameFormBackForward) { // Test that back/forward preserves POST data and document state when navigating // across frames (ie, from frame -> nonframe). TEST_F(SessionHistoryTest, CrossFrameFormBackForward) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // 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(server.TestServerPage("files/session_history/frames.html")); ASSERT_TRUE(tab_->NavigateToURL(frames)); EXPECT_EQ(L"bot1", GetTabTitle()); @@ -345,18 +337,16 @@ TEST_F(SessionHistoryTest, CrossFrameFormBackForward) { } #endif -// Test that back/forward entries are created for reference fragment -// navigations. Bug 730379. +// Test that back/forward entries are created for reference fragment navigations. +// Bug 730379. TEST_F(SessionHistoryTest, FragmentBackForward) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // 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(server.TestServerPage("files/session_history/fragment.html")); ASSERT_TRUE(tab_->NavigateToURL(fragment)); EXPECT_EQ(L"fragment", GetTabTitle()); EXPECT_EQ(fragment, GetTabURL()); @@ -395,7 +385,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(server.TestServerPage("files/session_history/bot3.html")); ASSERT_TRUE(tab_->NavigateToURL(bot3)); EXPECT_EQ(L"bot3", GetTabTitle()); EXPECT_EQ(bot3, GetTabURL()); @@ -418,24 +408,22 @@ TEST_F(SessionHistoryTest, FragmentBackForward) { // means the test will hang if it attempts to navigate too far forward or back, // since we'll be waiting forever for a load stop event. TEST_F(SessionHistoryTest, JavascriptHistory) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // 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"))); + server.TestServerPage("files/session_history/bot1.html"))); EXPECT_EQ(L"bot1", GetTabTitle()); ASSERT_TRUE(tab_->NavigateToURL( - server->TestServerPage("files/session_history/bot2.html"))); + server.TestServerPage("files/session_history/bot2.html"))); EXPECT_EQ(L"bot2", GetTabTitle()); ASSERT_TRUE(tab_->NavigateToURL( - server->TestServerPage("files/session_history/bot3.html"))); + server.TestServerPage("files/session_history/bot3.html"))); EXPECT_EQ(L"bot3", GetTabTitle()); // history is [blank, bot1, bot2, *bot3] @@ -467,7 +455,7 @@ TEST_F(SessionHistoryTest, JavascriptHistory) { EXPECT_EQ(L"bot1", GetTabTitle()); ASSERT_TRUE(tab_->NavigateToURL( - server->TestServerPage("files/session_history/bot3.html"))); + server.TestServerPage("files/session_history/bot3.html"))); EXPECT_EQ(L"bot3", GetTabTitle()); // history is [blank, bot1, *bot3] @@ -501,12 +489,10 @@ TEST_F(SessionHistoryTest, JavascriptHistory) { TEST_F(SessionHistoryTest, LocationReplace) { // Test that using location.replace doesn't leave the title of the old page // visible. - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); - ASSERT_TRUE(tab_->NavigateToURL(server->TestServerPage( - "files/session_history/replace.html?no-title.html"))); + ASSERT_TRUE(tab_->NavigateToURL( + server.TestServerPage("files/session_history/replace.html?no-title.html"))); EXPECT_EQ(L"", GetTabTitle()); } diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index 434f937..8843567 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -145,10 +145,8 @@ TEST_F(SessionRestoreUITest, RestoresForwardAndBackwardNavs) { // cross-site page and then forward again works. (Bug 1204135) TEST_F(SessionRestoreUITest, RestoresCrossSiteForwardAndBackwardNavs) { const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - GURL cross_site_url(server->TestServerPageW(L"files/title2.html")); + TestServer server(kDocRoot); + GURL cross_site_url(server.TestServerPageW(L"files/title2.html")); // Visit URLs on different sites. NavigateToURL(url1); diff --git a/chrome/browser/ssl_uitest.cc b/chrome/browser/ssl_uitest.cc index 13a8759..ccef280 100644 --- a/chrome/browser/ssl_uitest.cc +++ b/chrome/browser/ssl_uitest.cc @@ -41,17 +41,17 @@ class SSLUITest : public UITest { EXPECT_TRUE(browser_proxy->AppendTab(url)); } - HTTPTestServer* PlainServer() { - return HTTPTestServer::CreateServer(kDocRoot); + TestServer* PlainServer() { + return new TestServer(kDocRoot); } HTTPSTestServer* GoodCertServer() { - return HTTPSTestServer::CreateServer(util_.kHostName, util_.kOKHTTPSPort, + return new HTTPSTestServer(util_.kHostName, util_.kOKHTTPSPort, kDocRoot, util_.GetOKCertPath().ToWStringHack()); } HTTPSTestServer* BadCertServer() { - return HTTPSTestServer::CreateServer(util_.kHostName, util_.kBadHTTPSPort, + return new HTTPSTestServer(util_.kHostName, util_.kBadHTTPSPort, kDocRoot, util_.GetExpiredCertPath().ToWStringHack()); } @@ -65,7 +65,7 @@ class SSLUITest : public UITest { // Visits a regular page over http. TEST_F(SSLUITest, TestHTTP) { - scoped_ptr<HTTPTestServer> server(PlainServer()); + scoped_ptr<TestServer> server(PlainServer()); scoped_ptr<TabProxy> tab(GetActiveTabProxy()); NavigateTab(tab.get(), server->TestServerPageW(L"files/ssl/google.html")); @@ -87,7 +87,7 @@ TEST_F(SSLUITest, TestHTTP) { // Visits a page over http which includes broken https resources (status should // be OK). TEST_F(SSLUITest, TestHTTPWithBrokenHTTPSResource) { - scoped_ptr<HTTPTestServer> http_server(PlainServer()); + scoped_ptr<TestServer> http_server(PlainServer()); scoped_ptr<HTTPSTestServer> bad_https_server(BadCertServer()); scoped_ptr<TabProxy> tab(GetActiveTabProxy()); @@ -164,7 +164,7 @@ TEST_F(SSLUITest, TestHTTPSExpiredCert) { // Visits a page with mixed content. TEST_F(SSLUITest, TestMixedContents) { scoped_ptr<HTTPSTestServer> https_server(GoodCertServer()); - scoped_ptr<HTTPTestServer> http_server(PlainServer()); + scoped_ptr<TestServer> http_server(PlainServer()); // Load a page with mixed-content, the default behavior is to show the mixed // content. @@ -286,7 +286,7 @@ TEST_F(SSLUITest, TestUnsafeContents) { // Visits a page with mixed content loaded by JS (after the initial page load). TEST_F(SSLUITest, TestMixedContentsLoadedFromJS) { scoped_ptr<HTTPSTestServer> https_server(GoodCertServer()); - scoped_ptr<HTTPTestServer> http_server(PlainServer()); + scoped_ptr<TestServer> http_server(PlainServer()); scoped_ptr<TabProxy> tab(GetActiveTabProxy()); NavigateTab(tab.get(), https_server->TestServerPageW( @@ -325,7 +325,7 @@ TEST_F(SSLUITest, TestMixedContentsLoadedFromJS) { // memory cache). TEST_F(SSLUITest, TestCachedMixedContents) { scoped_ptr<HTTPSTestServer> https_server(GoodCertServer()); - scoped_ptr<HTTPTestServer> http_server(PlainServer()); + scoped_ptr<TestServer> http_server(PlainServer()); scoped_ptr<TabProxy> tab(GetActiveTabProxy()); NavigateTab(tab.get(), http_server->TestServerPageW( @@ -364,10 +364,9 @@ TEST_F(SSLUITest, TestCachedMixedContents) { // TODO(jcampan): this test is flacky and fails sometimes (bug #1065095) TEST_F(SSLUITest, DISABLED_TestCNInvalidStickiness) { const std::string kLocalHost = "localhost"; - scoped_refptr<HTTPSTestServer> https_server = - HTTPSTestServer::CreateServer(kLocalHost, util_.kOKHTTPSPort, - kDocRoot, util_.GetOKCertPath().ToWStringHack()); - ASSERT_TRUE(NULL != https_server.get()); + scoped_ptr<HTTPSTestServer> https_server( + new HTTPSTestServer(kLocalHost, util_.kOKHTTPSPort, + kDocRoot, util_.GetOKCertPath().ToWStringHack())); // First we hit the server with hostname, this generates an invalid policy // error. @@ -476,7 +475,7 @@ TEST_F(SSLUITest, TestRefNavigation) { // (bug #1966). // Disabled because flaky (bug #2136). TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) { - scoped_ptr<HTTPTestServer> http_server(PlainServer()); + scoped_ptr<TestServer> http_server(PlainServer()); scoped_ptr<HTTPSTestServer> bad_https_server(BadCertServer()); scoped_ptr<TabProxy> tab(GetActiveTabProxy()); @@ -562,7 +561,7 @@ TEST_F(SSLUITest, TestRedirectGoodToBadHTTPS) { // Visit a page over http that is a redirect to a page with https (good and // bad). TEST_F(SSLUITest, TestRedirectHTTPToHTTPS) { - scoped_ptr<HTTPTestServer> http_server(PlainServer()); + scoped_ptr<TestServer> http_server(PlainServer()); scoped_ptr<HTTPSTestServer> good_https_server(GoodCertServer()); scoped_ptr<HTTPSTestServer> bad_https_server(BadCertServer()); @@ -605,7 +604,7 @@ TEST_F(SSLUITest, TestRedirectHTTPToHTTPS) { // Visit a page over https that is a redirect to a page with http (to make sure // we don't keep the secure state). TEST_F(SSLUITest, TestRedirectHTTPSToHTTP) { - scoped_ptr<HTTPTestServer> http_server(PlainServer()); + scoped_ptr<TestServer> http_server(PlainServer()); scoped_ptr<HTTPSTestServer> https_server(GoodCertServer()); scoped_ptr<TabProxy> tab(GetActiveTabProxy()); @@ -661,7 +660,7 @@ TEST_F(SSLUITest, TestConnectToBadPort) { // back // - navigate to HTTP (expect mixed content), then back TEST_F(SSLUITest, TestGoodFrameNavigation) { - scoped_ptr<HTTPTestServer> http_server(PlainServer()); + scoped_ptr<TestServer> http_server(PlainServer()); scoped_ptr<HTTPSTestServer> good_https_server(GoodCertServer()); scoped_ptr<HTTPSTestServer> bad_https_server(BadCertServer()); @@ -799,7 +798,7 @@ TEST_F(SSLUITest, TestBadFrameNavigation) { // From an HTTP top frame, navigate to good and bad HTTPS (security state should // stay unauthenticated). TEST_F(SSLUITest, TestUnauthenticatedFrameNavigation) { - scoped_ptr<HTTPTestServer> http_server(PlainServer()); + scoped_ptr<TestServer> http_server(PlainServer()); scoped_ptr<HTTPSTestServer> good_https_server(GoodCertServer()); scoped_ptr<HTTPSTestServer> bad_https_server(BadCertServer()); diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index facd015..0bf2dbe 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -133,11 +133,9 @@ TEST_F(TabRestoreUITest, RestoreToDifferentWindow) { // to an existing SiteInstance. (Bug 1230446) TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) { const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - GURL http_url1(server->TestServerPageW(L"files/title1.html")); - GURL http_url2(server->TestServerPageW(L"files/title2.html")); + TestServer server(kDocRoot); + GURL http_url1(server.TestServerPageW(L"files/title1.html")); + GURL http_url2(server.TestServerPageW(L"files/title2.html")); scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); int initial_tab_count; @@ -178,11 +176,9 @@ TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) { // already exists. (Bug 1204135) TEST_F(TabRestoreUITest, RestoreCrossSiteWithExistingSiteInstance) { const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - GURL http_url1(server->TestServerPageW(L"files/title1.html")); - GURL http_url2(server->TestServerPageW(L"files/title2.html")); + TestServer server(kDocRoot); + GURL http_url1(server.TestServerPageW(L"files/title1.html")); + GURL http_url2(server.TestServerPageW(L"files/title2.html")); scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); int initial_tab_count; diff --git a/chrome/browser/url_fetcher_unittest.cc b/chrome/browser/url_fetcher_unittest.cc index 308964b..fe73d3f 100644 --- a/chrome/browser/url_fetcher_unittest.cc +++ b/chrome/browser/url_fetcher_unittest.cc @@ -338,19 +338,15 @@ TEST_F(URLFetcherTest, SameThreadsTest) { // Create the fetcher on the main thread. Since IO will happen on the main // thread, this will test URLFetcher's ability to do everything on one // thread. - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); - CreateFetcher(GURL(server->TestServerPage("defaultresponse"))); + CreateFetcher(GURL(server.TestServerPage("defaultresponse"))); MessageLoop::current()->Run(); } TEST_F(URLFetcherTest, DifferentThreadsTest) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // Create a separate thread that will create the URLFetcher. The current // (main) thread will do the IO, and when the fetch is complete it will // terminate the main thread's message loop; then the other thread's @@ -359,33 +355,27 @@ TEST_F(URLFetcherTest, DifferentThreadsTest) { base::Thread t("URLFetcher test thread"); t.Start(); t.message_loop()->PostTask(FROM_HERE, new FetcherWrapperTask(this, - GURL(server->TestServerPage("defaultresponse")))); + GURL(server.TestServerPage("defaultresponse")))); MessageLoop::current()->Run(); } TEST_F(URLFetcherPostTest, Basic) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - CreateFetcher(GURL(server->TestServerPage("echo"))); + TestServer server(kDocRoot); + CreateFetcher(GURL(server.TestServerPage("echo"))); MessageLoop::current()->Run(); } TEST_F(URLFetcherHeadersTest, Headers) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"net/data/url_request_unittest"); - ASSERT_TRUE(NULL != server.get()); - CreateFetcher(GURL(server->TestServerPage("files/with-headers.html"))); + TestServer server(L"net/data/url_request_unittest"); + CreateFetcher(GURL(server.TestServerPage("files/with-headers.html"))); MessageLoop::current()->Run(); // The actual tests are in the URLFetcherHeadersTest fixture. } TEST_F(URLFetcherProtectTest, Overload) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - GURL url = GURL(server->TestServerPage("defaultresponse")); + TestServer server(kDocRoot); + GURL url = GURL(server.TestServerPage("defaultresponse")); // Registers an entry for test url. It only allows 3 requests to be sent // in 200 milliseconds. @@ -400,10 +390,8 @@ TEST_F(URLFetcherProtectTest, Overload) { } TEST_F(URLFetcherProtectTest, ServerUnavailable) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); - GURL url = GURL(server->TestServerPage("files/server-unavailable.html")); + TestServer server(L"chrome/test/data"); + GURL url = GURL(server.TestServerPage("files/server-unavailable.html")); // Registers an entry for test url. The backoff time is calculated by: // new_backoff = 2.0 * old_backoff + 0 @@ -420,21 +408,17 @@ TEST_F(URLFetcherProtectTest, ServerUnavailable) { } TEST_F(URLFetcherBadHTTPSTest, BadHTTPSTest) { - scoped_refptr<HTTPSTestServer> server = - HTTPSTestServer::CreateServer(util_.kHostName, util_.kBadHTTPSPort, + HTTPSTestServer server(util_.kHostName, util_.kBadHTTPSPort, kDocRoot, util_.GetExpiredCertPath().ToWStringHack()); - ASSERT_TRUE(NULL != server.get()); - CreateFetcher(GURL(server->TestServerPage("defaultresponse"))); + CreateFetcher(GURL(server.TestServerPage("defaultresponse"))); MessageLoop::current()->Run(); } TEST_F(URLFetcherCancelTest, ReleasesContext) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); - GURL url = GURL(server->TestServerPage("files/server-unavailable.html")); + TestServer server(L"chrome/test/data"); + GURL url = GURL(server.TestServerPage("files/server-unavailable.html")); // Registers an entry for test url. The backoff time is calculated by: // new_backoff = 2.0 * old_backoff + 0 diff --git a/chrome/browser/view_source_uitest.cc b/chrome/browser/view_source_uitest.cc index 73cc875..1aad505 100644 --- a/chrome/browser/view_source_uitest.cc +++ b/chrome/browser/view_source_uitest.cc @@ -38,14 +38,12 @@ class ViewSourceTest : public UITest { // set in the html was set successfully (it shouldn't because we rendered the // page in view source) TEST_F(ViewSourceTest, DoesBrowserRenderInViewSource) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); std::string cookie = "viewsource_cookie"; std::string cookie_data = "foo"; // First we navigate to our view-source test page - GURL url = server->TestServerPageW(test_html_); + GURL url = server.TestServerPageW(test_html_); url = GURL("view-source:" + url.spec()); scoped_ptr<TabProxy> tab(GetActiveTab()); tab->NavigateToURL(url); @@ -63,12 +61,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<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // First we navigate to google.html - GURL url = server->TestServerPageW(test_html_); + GURL url = server.TestServerPageW(test_html_); NavigateToURL(url); // Then we navigate to the SAME url but with the view-source: prefix @@ -82,12 +78,10 @@ TEST_F(ViewSourceTest, DoesBrowserConsumeViewSourcePrefix) { // Make sure that when looking at the actual page, we can select // "View Source" from the Page menu. TEST_F(ViewSourceTest, ViewSourceInPageMenuEnabledOnANormalPage) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // First we navigate to google.html - GURL url = server->TestServerPageW(test_html_); + GURL url = server.TestServerPageW(test_html_); NavigateToURL(url); EXPECT_TRUE(IsPageMenuCommandEnabled(IDC_VIEW_SOURCE)); @@ -96,12 +90,10 @@ TEST_F(ViewSourceTest, ViewSourceInPageMenuEnabledOnANormalPage) { // Make sure that when looking at the page source, we can't select // "View Source" from the Page menu. TEST_F(ViewSourceTest, ViewSourceInPageMenuDisabledWhileViewingSource) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); // First we navigate to google.html - GURL url = server->TestServerPageW(test_html_); + GURL url = server.TestServerPageW(test_html_); GURL url_viewsource = GURL("view-source:" + url.spec()); NavigateToURL(url_viewsource); diff --git a/chrome/browser/views/find_bar_win_interactive_uitest.cc b/chrome/browser/views/find_bar_win_interactive_uitest.cc index c036b7c..383a64a 100644 --- a/chrome/browser/views/find_bar_win_interactive_uitest.cc +++ b/chrome/browser/views/find_bar_win_interactive_uitest.cc @@ -52,9 +52,7 @@ bool ActivateTabByClick(AutomationProxy* automation, } // namespace TEST_F(FindInPageTest, CrashEscHandlers) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow()); ASSERT_TRUE(browser.get() != NULL); @@ -63,7 +61,7 @@ TEST_F(FindInPageTest, CrashEscHandlers) { ASSERT_TRUE(window.get() != NULL); // First we navigate to our test page (tab A). - GURL url = server->TestServerPageW(kSimplePage); + GURL url = server.TestServerPageW(kSimplePage); scoped_ptr<TabProxy> tabA(GetActiveTab()); EXPECT_NE(AUTOMATION_MSG_NAVIGATION_ERROR, tabA->NavigateToURL(url)); diff --git a/chrome/browser/views/find_bar_win_uitest.cc b/chrome/browser/views/find_bar_win_uitest.cc index 94906b8..ac534b4 100644 --- a/chrome/browser/views/find_bar_win_uitest.cc +++ b/chrome/browser/views/find_bar_win_uitest.cc @@ -25,12 +25,10 @@ const std::wstring kTooFewMatchesPage = L"files/find_in_page/bug_1155639.html"; // This test loads a page with frames and starts FindInPage requests TEST_F(FindInPageControllerTest, FindInPageFrames) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); + TestServer server(L"chrome/test/data"); // First we navigate to our frames page. - GURL url = server->TestServerPageW(kFramePage); + GURL url = server.TestServerPageW(kFramePage); scoped_ptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab->NavigateToURL(url)); WaitUntilTabCount(1); @@ -78,12 +76,10 @@ TEST_F(FindInPageControllerTest, FindInPageFrames) { // This test loads a single-frame page and makes sure the ordinal returned makes // sense as we FindNext over all the items. TEST_F(FindInPageControllerTest, FindInPageOrdinal) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); + TestServer server(L"chrome/test/data"); // First we navigate to our frames page. - GURL url = server->TestServerPageW(kFrameData); + GURL url = server.TestServerPageW(kFrameData); scoped_ptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab->NavigateToURL(url)); WaitUntilTabCount(1); @@ -116,12 +112,10 @@ TEST_F(FindInPageControllerTest, FindInPageOrdinal) { // This test loads a page with frames and makes sure the ordinal returned makes // sense. TEST_F(FindInPageControllerTest, FindInPageMultiFramesOrdinal) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); + TestServer server(L"chrome/test/data"); // First we navigate to our frames page. - GURL url = server->TestServerPageW(kFramePage); + GURL url = server.TestServerPageW(kFramePage); scoped_ptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab->NavigateToURL(url)); WaitUntilTabCount(1); @@ -162,12 +156,10 @@ TEST_F(FindInPageControllerTest, FindInPageMultiFramesOrdinal) { // We could get ordinals out of whack when restarting search in subframes. // See http://crbug.com/5132 TEST_F(FindInPageControllerTest, FindInPage_Issue5132) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); + TestServer server(L"chrome/test/data"); // First we navigate to our frames page. - GURL url = server->TestServerPageW(kFramePage); + GURL url = server.TestServerPageW(kFramePage); scoped_ptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab->NavigateToURL(url)); WaitUntilTabCount(1); @@ -193,11 +185,9 @@ TEST_F(FindInPageControllerTest, FindInPage_Issue5132) { // Load a page with no selectable text and make sure we don't crash. TEST_F(FindInPageControllerTest, FindUnSelectableText) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); + TestServer server(L"chrome/test/data"); - GURL url = server->TestServerPageW(kUserSelectPage); + GURL url = server.TestServerPageW(kUserSelectPage); scoped_ptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab->NavigateToURL(url)); WaitUntilTabCount(1); @@ -209,11 +199,9 @@ TEST_F(FindInPageControllerTest, FindUnSelectableText) { // Try to reproduce the crash seen in issue 1341577. TEST_F(FindInPageControllerTest, FindCrash_Issue1341577) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); + TestServer server(L"chrome/test/data"); - GURL url = server->TestServerPageW(kCrashPage); + GURL url = server.TestServerPageW(kCrashPage); scoped_ptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab->NavigateToURL(url)); WaitUntilTabCount(1); @@ -241,11 +229,9 @@ TEST_F(FindInPageControllerTest, FindCrash_Issue1341577) { // ms) to find one or more of those matches (so Find times out and has to try // again from where it left off). TEST_F(FindInPageControllerTest, FindEnoughMatches_Issue1155639) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); + TestServer server(L"chrome/test/data"); - GURL url = server->TestServerPageW(kTooFewMatchesPage); + GURL url = server.TestServerPageW(kTooFewMatchesPage); scoped_ptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab->NavigateToURL(url)); WaitUntilTabCount(1); @@ -258,11 +244,9 @@ TEST_F(FindInPageControllerTest, FindEnoughMatches_Issue1155639) { // The find window should not change its location just because we open and close // a new tab. TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); + TestServer server(L"chrome/test/data"); - GURL url = server->TestServerPageW(kFramePage); + GURL url = server.TestServerPageW(kFramePage); scoped_ptr<TabProxy> tabA(GetActiveTab()); ASSERT_TRUE(tabA->NavigateToURL(url)); WaitUntilTabCount(1); @@ -319,11 +303,9 @@ TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) { // Make sure Find box disappears on Navigate but not on Refresh. TEST_F(FindInPageControllerTest, FindDisappearOnNavigate) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); + TestServer server(L"chrome/test/data"); - GURL url = server->TestServerPageW(kUserSelectPage); + GURL url = server.TestServerPageW(kUserSelectPage); scoped_ptr<TabProxy> tab(GetActiveTab()); ASSERT_TRUE(tab->NavigateToURL(url)); WaitUntilTabCount(1); diff --git a/chrome/common/chrome_plugin_unittest.cc b/chrome/common/chrome_plugin_unittest.cc index 096989f..1465f1a 100644 --- a/chrome/common/chrome_plugin_unittest.cc +++ b/chrome/common/chrome_plugin_unittest.cc @@ -258,11 +258,8 @@ TEST_F(ChromePluginTest, CanMakeGETRequestAsync) { // Tests that the plugin can issue a POST request. TEST_F(ChromePluginTest, CanMakePOSTRequest) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - - GURL url = server->TestServerPage("echo"); + TestServer server(kDocRoot); + GURL url = server.TestServerPage("echo"); EXPECT_EQ(CPERR_SUCCESS, test_funcs_.test_make_request("POST", url)); diff --git a/chrome/common/net/cache_uitest.cc b/chrome/common/net/cache_uitest.cc index 19ecc01..69b5892 100644 --- a/chrome/common/net/cache_uitest.cc +++ b/chrome/common/net/cache_uitest.cc @@ -54,10 +54,8 @@ class CacheTest : public UITest { void CacheTest::RunCacheTest(const std::wstring &url, bool expect_new_tab_cached, bool expect_delayed_reload) { - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); - GURL test_page(server->TestServerPageW(url)); + TestServer server(L"chrome/test/data"); + GURL test_page(server.TestServerPageW(url)); NavigateToURL(test_page); std::wstring original_time = GetActiveTabTitle(); diff --git a/chrome/test/ui/inspector_controller_uitest.cc b/chrome/test/ui/inspector_controller_uitest.cc index 29b1489..885eb69 100644 --- a/chrome/test/ui/inspector_controller_uitest.cc +++ b/chrome/test/ui/inspector_controller_uitest.cc @@ -37,20 +37,14 @@ TEST_F(InspectorControllerTest, DISABLED_InspectElement) { if (CommandLine().HasSwitch(switches::kSingleProcess)) return; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); - ASSERT_TRUE(NULL != server.get()); - + TestServer server(L"chrome/test/data"); ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); // We don't track resources until we've opened the inspector. - NavigateTab(tab.get(), server->TestServerPageW( - L"files/inspector/test1.html")); + NavigateTab(tab.get(), server.TestServerPageW(L"files/inspector/test1.html")); tab->InspectElement(0, 0); - NavigateTab(tab.get(), server->TestServerPageW( - L"files/inspector/test1.html")); + NavigateTab(tab.get(), server.TestServerPageW(L"files/inspector/test1.html")); EXPECT_EQ(1, tab->InspectElement(0, 0)); - NavigateTab(tab.get(), server->TestServerPageW( - L"files/inspector/test2.html")); + NavigateTab(tab.get(), server.TestServerPageW(L"files/inspector/test2.html")); EXPECT_EQ(2, tab->InspectElement(0, 0)); } |