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/collected_cookies_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/collected_cookies_uitest.cc')
| -rw-r--r-- | chrome/browser/collected_cookies_uitest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/collected_cookies_uitest.cc b/chrome/browser/collected_cookies_uitest.cc index d51626a..e59d36d 100644 --- a/chrome/browser/collected_cookies_uitest.cc +++ b/chrome/browser/collected_cookies_uitest.cc @@ -11,7 +11,7 @@ #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/ui/ui_test.h" -#include "net/url_request/url_request_unittest.h" +#include "net/test/test_server.h" namespace { @@ -23,7 +23,8 @@ typedef UITest CollectedCookiesTest; // Test is flaky. http://crbug.com/49539 TEST_F(CollectedCookiesTest, FLAKY_DoubleDisplay) { - scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot)); + scoped_refptr<net::HTTPTestServer> server( + net::HTTPTestServer::CreateServer(kDocRoot)); ASSERT_TRUE(NULL != server.get()); scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); @@ -45,7 +46,8 @@ TEST_F(CollectedCookiesTest, FLAKY_DoubleDisplay) { // Test is flaky. http://crbug.com/49539 TEST_F(CollectedCookiesTest, FLAKY_NavigateAway) { - scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot)); + scoped_refptr<net::HTTPTestServer> server( + net::HTTPTestServer::CreateServer(kDocRoot)); ASSERT_TRUE(NULL != server.get()); scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); |