summaryrefslogtreecommitdiffstats
path: root/chrome/browser/errorpage_uitest.cc
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-30 23:29:54 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-30 23:29:54 +0000
commit5d9c52a60b5e91819c2664572a6e0ef343a3ea28 (patch)
tree30406e4c144cf8d036a4ef1e4dabebcc1b6a8e05 /chrome/browser/errorpage_uitest.cc
parent997c8ca739b3f79ff76adbbf421c7056af8ccdcb (diff)
downloadchromium_src-5d9c52a60b5e91819c2664572a6e0ef343a3ea28.zip
chromium_src-5d9c52a60b5e91819c2664572a6e0ef343a3ea28.tar.gz
chromium_src-5d9c52a60b5e91819c2664572a6e0ef343a3ea28.tar.bz2
Revert 7508.7509 and 7510
Review URL: http://codereview.chromium.org/17030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/errorpage_uitest.cc')
-rw-r--r--chrome/browser/errorpage_uitest.cc6
1 files changed, 2 insertions, 4 deletions
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