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/interstitial_page_uitest.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/interstitial_page_uitest.cc')
| -rw-r--r-- | chrome/browser/interstitial_page_uitest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/interstitial_page_uitest.cc b/chrome/browser/interstitial_page_uitest.cc index b7454b2..67b2435 100644 --- a/chrome/browser/interstitial_page_uitest.cc +++ b/chrome/browser/interstitial_page_uitest.cc @@ -55,7 +55,7 @@ class InterstitialPageTest : public UITest { // See bug 6729. TEST_F(InterstitialPageTest, DISABLED_TestShowHideInterstitial) { scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); @@ -84,7 +84,7 @@ TEST_F(InterstitialPageTest, DISABLED_TestShowHideInterstitial) { // the interstitial, which breaks this test because no notification occurs. TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenBack) { scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); @@ -103,7 +103,7 @@ TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenBack) { // Flacky on Windows 2000 bot. Disabled for now bug #1173138. TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenNavigate) { scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); @@ -124,7 +124,7 @@ TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenNavigate) { // See bug 6729. TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenCloseTab) { scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); // Create 2 tabs so closing one does not close the browser. @@ -142,7 +142,7 @@ TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenCloseTab) { // This test is disabled. See bug #1119448. TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenCloseBrowser) { scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); + HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); ::scoped_ptr<TabProxy> tab(GetActiveTabProxy()); |