From 5d9c52a60b5e91819c2664572a6e0ef343a3ea28 Mon Sep 17 00:00:00 2001 From: "nsylvain@chromium.org" Date: Tue, 30 Dec 2008 23:29:54 +0000 Subject: Revert 7508.7509 and 7510 Review URL: http://codereview.chromium.org/17030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7514 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/login_prompt_uitest.cc | 42 ++++++++++++++--------------------- 1 file changed, 17 insertions(+), 25 deletions(-) (limited to 'chrome/browser/login_prompt_uitest.cc') diff --git a/chrome/browser/login_prompt_uitest.cc b/chrome/browser/login_prompt_uitest.cc index 1d7d25c..3969ccf 100644 --- a/chrome/browser/login_prompt_uitest.cc +++ b/chrome/browser/login_prompt_uitest.cc @@ -62,11 +62,9 @@ wstring ExpectedTitleFromAuth(wstring username, wstring password) { // Test that "Basic" HTTP authentication works. TEST_F(LoginPromptTest, TestBasicAuth) { - scoped_refptr server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); ::scoped_ptr tab(GetActiveTabProxy()); - NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); + NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_FALSE(tab->SetAuth(username_basic_, password_bad_)); @@ -74,7 +72,7 @@ TEST_F(LoginPromptTest, TestBasicAuth) { EXPECT_TRUE(tab->CancelAuth()); EXPECT_EQ(L"Denied: wrong password", GetActiveTabTitle()); - NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); + NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_TRUE(tab->SetAuth(username_basic_, password_)); @@ -84,18 +82,16 @@ TEST_F(LoginPromptTest, TestBasicAuth) { // Test that "Digest" HTTP authentication works. TEST_F(LoginPromptTest, TestDigestAuth) { - scoped_refptr server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); ::scoped_ptr tab(GetActiveTabProxy()); - NavigateTab(tab.get(), server->TestServerPageW(L"auth-digest")); + NavigateTab(tab.get(), server.TestServerPageW(L"auth-digest")); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_FALSE(tab->SetAuth(username_digest_, password_bad_)); EXPECT_TRUE(tab->CancelAuth()); EXPECT_EQ(L"Denied: wrong password", GetActiveTabTitle()); - NavigateTab(tab.get(), server->TestServerPageW(L"auth-digest")); + NavigateTab(tab.get(), server.TestServerPageW(L"auth-digest")); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_TRUE(tab->SetAuth(username_digest_, password_)); @@ -105,16 +101,14 @@ TEST_F(LoginPromptTest, TestDigestAuth) { // Test that logging in on 2 tabs at once works. TEST_F(LoginPromptTest, TestTwoAuths) { - scoped_refptr server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); ::scoped_ptr basic_tab(GetActiveTabProxy()); - NavigateTab(basic_tab.get(), server->TestServerPageW(L"auth-basic")); + NavigateTab(basic_tab.get(), server.TestServerPageW(L"auth-basic")); AppendTab(GURL("about:blank")); ::scoped_ptr digest_tab(GetActiveTabProxy()); - NavigateTab(digest_tab.get(), server->TestServerPageW(L"auth-digest")); + NavigateTab(digest_tab.get(), server.TestServerPageW(L"auth-digest")); // TODO(devint): http://b/1158262 basic_tab is not active, so this logs in to // a page whose tab isn't active, which isn't actually possible for the user @@ -135,36 +129,34 @@ TEST_F(LoginPromptTest, TestTwoAuths) { // Test that cancelling authentication works. TEST_F(LoginPromptTest, TestCancelAuth) { - scoped_refptr server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); + TestServer server(kDocRoot); ::scoped_ptr tab(GetActiveTabProxy()); // First navigate to a test server page so we have something to go back to. - EXPECT_TRUE(tab->NavigateToURL(server->TestServerPageW(L"a"))); + EXPECT_TRUE(tab->NavigateToURL(server.TestServerPageW(L"a"))); // Navigating while auth is requested is the same as cancelling. - NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); + NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); EXPECT_TRUE(tab->NeedsAuth()); - EXPECT_TRUE(tab->NavigateToURL(server->TestServerPageW(L"b"))); + EXPECT_TRUE(tab->NavigateToURL(server.TestServerPageW(L"b"))); EXPECT_FALSE(tab->NeedsAuth()); - NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); + NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_TRUE(tab->GoBack()); // should bring us back to 'a' EXPECT_FALSE(tab->NeedsAuth()); // Now add a page and go back, so we have something to go forward to. - EXPECT_TRUE(tab->NavigateToURL(server->TestServerPageW(L"c"))); + EXPECT_TRUE(tab->NavigateToURL(server.TestServerPageW(L"c"))); EXPECT_TRUE(tab->GoBack()); // should bring us back to 'a' - NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); + NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_TRUE(tab->GoForward()); // should bring us to 'c' EXPECT_FALSE(tab->NeedsAuth()); // Now test that cancelling works as expected. - NavigateTab(tab.get(), server->TestServerPageW(L"auth-basic")); + NavigateTab(tab.get(), server.TestServerPageW(L"auth-basic")); EXPECT_TRUE(tab->NeedsAuth()); EXPECT_TRUE(tab->CancelAuth()); EXPECT_FALSE(tab->NeedsAuth()); -- cgit v1.1