From 95409e1020037b0bbfbce17f861d3de090d10186 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Tue, 17 Aug 2010 20:07:11 +0000 Subject: Test server cleanup patch of death: - reduce the number of different classes - clean up the internal code - modify the interface to expose less internal details (this will allow more flexibility with port numbers) TEST=many BUG=49680 Review URL: http://codereview.chromium.org/3080029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56405 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/errorpage_uitest.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'chrome/browser/errorpage_uitest.cc') 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 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")); } -- cgit v1.1