From cad01431b348b5c01ded71f05f2f30f8dcc41d22 Mon Sep 17 00:00:00 2001 From: "sky@google.com" Date: Thu, 29 Jan 2009 21:59:55 +0000 Subject: 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 --- chrome/browser/history/redirect_uitest.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'chrome/browser/history') diff --git a/chrome/browser/history/redirect_uitest.cc b/chrome/browser/history/redirect_uitest.cc index e9f7c0b..5610481 100644 --- a/chrome/browser/history/redirect_uitest.cc +++ b/chrome/browser/history/redirect_uitest.cc @@ -31,7 +31,7 @@ class RedirectTest : public UITest { // Tests a single server redirect TEST_F(RedirectTest, Server) { scoped_refptr server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); GURL final_url = server->TestServerPageW(std::wstring()); @@ -53,7 +53,7 @@ TEST_F(RedirectTest, Server) { // Tests a single client redirect. TEST_F(RedirectTest, Client) { scoped_refptr server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); GURL final_url = server->TestServerPageW(std::wstring()); @@ -77,7 +77,7 @@ TEST_F(RedirectTest, Client) { TEST_F(RedirectTest, ClientEmptyReferer) { scoped_refptr server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); GURL final_url = server->TestServerPageW(std::wstring()); @@ -143,7 +143,7 @@ TEST_F(RedirectTest, ClientCancelled) { // failing. TEST_F(RedirectTest, DISABLED_ClientServerServer) { scoped_refptr server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); GURL final_url = server->TestServerPageW(std::wstring()); @@ -177,7 +177,7 @@ TEST_F(RedirectTest, DISABLED_ClientServerServer) { // Tests that the "#reference" gets preserved across server redirects. TEST_F(RedirectTest, ServerReference) { scoped_refptr server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); const std::string ref("reference"); @@ -198,7 +198,7 @@ TEST_F(RedirectTest, ServerReference) { // B) does not take place. TEST_F(RedirectTest, NoHttpToFile) { scoped_refptr server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); std::wstring test_file = test_data_directory_; file_util::AppendToPath(&test_file, L"http_to_file.html"); @@ -221,7 +221,7 @@ TEST_F(RedirectTest, NoHttpToFile) { // flagged as client redirects. See bug 1139823. TEST_F(RedirectTest, ClientFragments) { scoped_refptr server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); std::wstring test_file = test_data_directory_; @@ -259,7 +259,7 @@ TEST_F(RedirectTest, // for the response (which means it hasn't committed the load for the client // redirect destination page yet), we issue a new navigation request. scoped_refptr server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); GURL final_url = server->TestServerPageW(std::wstring(L"files/title2.html")); -- cgit v1.1