summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
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_contents
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_contents')
-rw-r--r--chrome/browser/tab_contents/view_source_uitest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/tab_contents/view_source_uitest.cc b/chrome/browser/tab_contents/view_source_uitest.cc
index 1cc19c6..d0089ee 100644
--- a/chrome/browser/tab_contents/view_source_uitest.cc
+++ b/chrome/browser/tab_contents/view_source_uitest.cc
@@ -39,7 +39,7 @@ class ViewSourceTest : public UITest {
// page in view source)
TEST_F(ViewSourceTest, DoesBrowserRenderInViewSource) {
scoped_refptr<HTTPTestServer> server =
- HTTPTestServer::CreateServer(kDocRoot);
+ HTTPTestServer::CreateServer(kDocRoot, NULL);
ASSERT_TRUE(NULL != server.get());
std::string cookie = "viewsource_cookie";
std::string cookie_data = "foo";
@@ -64,7 +64,7 @@ TEST_F(ViewSourceTest, DoesBrowserRenderInViewSource) {
// URL) if the URL was not changed (apart from adding the view-source prefix)
TEST_F(ViewSourceTest, DoesBrowserConsumeViewSourcePrefix) {
scoped_refptr<HTTPTestServer> server =
- HTTPTestServer::CreateServer(kDocRoot);
+ HTTPTestServer::CreateServer(kDocRoot, NULL);
ASSERT_TRUE(NULL != server.get());
// First we navigate to google.html
@@ -83,7 +83,7 @@ TEST_F(ViewSourceTest, DoesBrowserConsumeViewSourcePrefix) {
// "View Source" from the Page menu.
TEST_F(ViewSourceTest, ViewSourceInPageMenuEnabledOnANormalPage) {
scoped_refptr<HTTPTestServer> server =
- HTTPTestServer::CreateServer(kDocRoot);
+ HTTPTestServer::CreateServer(kDocRoot, NULL);
ASSERT_TRUE(NULL != server.get());
// First we navigate to google.html
@@ -97,7 +97,7 @@ TEST_F(ViewSourceTest, ViewSourceInPageMenuEnabledOnANormalPage) {
// "View Source" from the Page menu.
TEST_F(ViewSourceTest, ViewSourceInPageMenuDisabledWhileViewingSource) {
scoped_refptr<HTTPTestServer> server =
- HTTPTestServer::CreateServer(kDocRoot);
+ HTTPTestServer::CreateServer(kDocRoot, NULL);
ASSERT_TRUE(NULL != server.get());
// First we navigate to google.html