From 3985ba8a1d1e396d98c4dbec84077d6a67109db9 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Thu, 29 Jul 2010 21:44:12 +0000 Subject: 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 --- chrome/browser/collected_cookies_uitest.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'chrome/browser/collected_cookies_uitest.cc') 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 server(HTTPTestServer::CreateServer(kDocRoot)); + scoped_refptr server( + net::HTTPTestServer::CreateServer(kDocRoot)); ASSERT_TRUE(NULL != server.get()); scoped_refptr 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 server(HTTPTestServer::CreateServer(kDocRoot)); + scoped_refptr server( + net::HTTPTestServer::CreateServer(kDocRoot)); ASSERT_TRUE(NULL != server.get()); scoped_refptr browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); -- cgit v1.1