diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 21:44:12 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 21:44:12 +0000 |
| commit | 3985ba8a1d1e396d98c4dbec84077d6a67109db9 (patch) | |
| tree | aa092101b582f5a9973fc68cce625834a9436c86 /chrome/browser/errorpage_uitest.cc | |
| parent | 4ada238a76785ee78396cfb8e5992044c302de1e (diff) | |
| download | chromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.zip chromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.tar.gz chromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.tar.bz2 | |
GTTF: Move more test server code from net/url_request/url_request_unittest.h
to net/test/test_server.h
No code changes, just a move.
TEST=none
BUG=49680
Review URL: http://codereview.chromium.org/3034038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/errorpage_uitest.cc')
| -rw-r--r-- | chrome/browser/errorpage_uitest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc index b7a0efb3..705dc14 100644 --- a/chrome/browser/errorpage_uitest.cc +++ b/chrome/browser/errorpage_uitest.cc @@ -7,7 +7,7 @@ #include "chrome/test/ui/ui_test.h" #include "chrome/browser/net/url_request_failed_dns_job.h" #include "chrome/browser/net/url_request_mock_http_job.h" -#include "net/url_request/url_request_unittest.h" +#include "net/test/test_server.h" class ErrorPageTest : public UITest { protected: @@ -168,8 +168,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"); + 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); |