diff options
author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 21:59:55 +0000 |
---|---|---|
committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 21:59:55 +0000 |
commit | cad01431b348b5c01ded71f05f2f30f8dcc41d22 (patch) | |
tree | 8594c4da331d50d7bd5db3e8abf96858da5d7fd8 /chrome/browser/net/url_fetcher_unittest.cc | |
parent | 5ebeb1191489135b549a38e1490b5b944776a50d (diff) | |
download | chromium_src-cad01431b348b5c01ded71f05f2f30f8dcc41d22.zip chromium_src-cad01431b348b5c01ded71f05f2f30f8dcc41d22.tar.gz chromium_src-cad01431b348b5c01ded71f05f2f30f8dcc41d22.tar.bz2 |
Provide the option for HTTPServer to be created with a specific
MessageLoop. I'm going to need this when running ui tests in
process. In this case I'll pass in the IO thread.
I'll change all callers to use the new method, but before doing that
wanted to make sure you're ok with it.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/19039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/url_fetcher_unittest.cc')
-rw-r--r-- | chrome/browser/net/url_fetcher_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/net/url_fetcher_unittest.cc b/chrome/browser/net/url_fetcher_unittest.cc index 11aafe7..03b40d7 100644 --- a/chrome/browser/net/url_fetcher_unittest.cc +++ b/chrome/browser/net/url_fetcher_unittest.cc @@ -347,7 +347,7 @@ TEST_F(URLFetcherTest, SameThreadsTest) { // thread, this will test URLFetcher's ability to do everything on one // thread. scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); CreateFetcher(GURL(server->TestServerPage("defaultresponse"))); @@ -357,7 +357,7 @@ TEST_F(URLFetcherTest, SameThreadsTest) { TEST_F(URLFetcherTest, DifferentThreadsTest) { scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); // Create a separate thread that will create the URLFetcher. The current // (main) thread will do the IO, and when the fetch is complete it will @@ -374,7 +374,7 @@ TEST_F(URLFetcherTest, DifferentThreadsTest) { TEST_F(URLFetcherPostTest, Basic) { scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); CreateFetcher(GURL(server->TestServerPage("echo"))); MessageLoop::current()->Run(); @@ -382,7 +382,7 @@ TEST_F(URLFetcherPostTest, Basic) { TEST_F(URLFetcherHeadersTest, Headers) { scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"net/data/url_request_unittest"); + HTTPTestServer::CreateServer(L"net/data/url_request_unittest", NULL); ASSERT_TRUE(NULL != server.get()); CreateFetcher(GURL(server->TestServerPage("files/with-headers.html"))); MessageLoop::current()->Run(); @@ -391,7 +391,7 @@ TEST_F(URLFetcherHeadersTest, Headers) { TEST_F(URLFetcherProtectTest, Overload) { scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); GURL url = GURL(server->TestServerPage("defaultresponse")); @@ -409,7 +409,7 @@ TEST_F(URLFetcherProtectTest, Overload) { TEST_F(URLFetcherProtectTest, ServerUnavailable) { scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); + HTTPTestServer::CreateServer(L"chrome/test/data", NULL); ASSERT_TRUE(NULL != server.get()); GURL url = GURL(server->TestServerPage("files/server-unavailable.html")); @@ -446,7 +446,7 @@ TEST_F(URLFetcherBadHTTPSTest, DISABLED_BadHTTPSTest) { TEST_F(URLFetcherCancelTest, ReleasesContext) { scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(L"chrome/test/data"); + HTTPTestServer::CreateServer(L"chrome/test/data", NULL); ASSERT_TRUE(NULL != server.get()); GURL url = GURL(server->TestServerPage("files/server-unavailable.html")); |