summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_restore_uitest.cc
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-29 21:59:55 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-29 21:59:55 +0000
commitcad01431b348b5c01ded71f05f2f30f8dcc41d22 (patch)
tree8594c4da331d50d7bd5db3e8abf96858da5d7fd8 /chrome/browser/tab_restore_uitest.cc
parent5ebeb1191489135b549a38e1490b5b944776a50d (diff)
downloadchromium_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/tab_restore_uitest.cc')
-rw-r--r--chrome/browser/tab_restore_uitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index 48aea5a..e3ef0ef 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -133,7 +133,7 @@ TEST_F(TabRestoreUITest, RestoreToDifferentWindow) {
TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) {
const wchar_t kDocRoot[] = L"chrome/test/data";
scoped_refptr<HTTPTestServer> server =
- HTTPTestServer::CreateServer(kDocRoot);
+ HTTPTestServer::CreateServer(kDocRoot, NULL);
ASSERT_TRUE(NULL != server.get());
GURL http_url1(server->TestServerPageW(L"files/title1.html"));
GURL http_url2(server->TestServerPageW(L"files/title2.html"));
@@ -178,7 +178,7 @@ TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) {
TEST_F(TabRestoreUITest, RestoreCrossSiteWithExistingSiteInstance) {
const wchar_t kDocRoot[] = L"chrome/test/data";
scoped_refptr<HTTPTestServer> server =
- HTTPTestServer::CreateServer(kDocRoot);
+ HTTPTestServer::CreateServer(kDocRoot, NULL);
ASSERT_TRUE(NULL != server.get());
GURL http_url1(server->TestServerPageW(L"files/title1.html"));
GURL http_url2(server->TestServerPageW(L"files/title2.html"));