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/tab_restore_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/tab_restore_uitest.cc')
-rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index 009d780..dd1bc29 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -19,7 +19,7 @@ #include "chrome/test/ui/ui_test.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" -#include "net/url_request/url_request_unittest.h" +#include "net/test/test_server.h" // http://code.google.com/p/chromium/issues/detail?id=14774 #if (defined(OS_WIN) || defined(OS_CHROMEOS)) && !defined(NDEBUG) @@ -459,7 +459,8 @@ TEST_F(TabRestoreUITest, FLAKY_RestoreIntoSameWindow) { // 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)); + scoped_refptr<net::HTTPTestServer> server( + net::HTTPTestServer::CreateServer(kDocRoot)); ASSERT_TRUE(NULL != server.get()); GURL http_url1(server->TestServerPage("files/title1.html")); GURL http_url2(server->TestServerPage("files/title2.html")); @@ -505,7 +506,8 @@ 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)); + scoped_refptr<net::HTTPTestServer> server( + net::HTTPTestServer::CreateServer(kDocRoot)); ASSERT_TRUE(NULL != server.get()); GURL http_url1(server->TestServerPage("files/title1.html")); GURL http_url2(server->TestServerPage("files/title2.html")); @@ -646,7 +648,8 @@ TEST_F(TabRestoreUITest, RestoreTabWithSpecialURL) { // entry and see that it loads properly. See http://crbug.com/31905 TEST_F(TabRestoreUITest, RestoreTabWithSpecialURLOnBack) { const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot)); + scoped_refptr<net::HTTPTestServer> server( + net::HTTPTestServer::CreateServer(kDocRoot)); ASSERT_TRUE(server.get()); const GURL http_url(server->TestServerPage("files/title1.html")); |