Revert 7508.7509 and 7510

chrome/browser/login_prompt_uitest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "chrome/browser/url_fixer_upper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
@@ skipping 44 matching lines @@
 
 wstring ExpectedTitleFromAuth(wstring username, wstring password) {
   // The TestServer sets the title to username/password on successful login.
   return username + L"/" + password;
 }
 
 }  // namespace
 
 // Test that "Basic" HTTP authentication works.
 TEST_F(LoginPromptTest, TestBasicAuth) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
   ::scoped_ptr<TabProxy> 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_));
   EXPECT_TRUE(tab->NeedsAuth());
   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_));
   EXPECT_EQ(ExpectedTitleFromAuth(username_basic_, password_),
             GetActiveTabTitle());
 }
 
 // Test that "Digest" HTTP authentication works.
 TEST_F(LoginPromptTest, TestDigestAuth) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
   ::scoped_ptr<TabProxy> 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_));
   EXPECT_EQ(ExpectedTitleFromAuth(username_digest_, password_),
             GetActiveTabTitle());
 }
 
 // Test that logging in on 2 tabs at once works.
 TEST_F(LoginPromptTest, TestTwoAuths) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   ::scoped_ptr<TabProxy> 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<TabProxy> 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
   // to do. I had a fix for this, but I'm reverting it to see if it makes the
   // test less flaky.
   EXPECT_TRUE(basic_tab->NeedsAuth());
   EXPECT_TRUE(basic_tab->SetAuth(username_basic_, password_));
   EXPECT_TRUE(digest_tab->NeedsAuth());
   EXPECT_TRUE(digest_tab->SetAuth(username_digest_, password_));
 
   wstring title;
   EXPECT_TRUE(basic_tab->GetTabTitle(&title));
   EXPECT_EQ(ExpectedTitleFromAuth(username_basic_, password_), title);
 
   EXPECT_TRUE(digest_tab->GetTabTitle(&title));
   EXPECT_EQ(ExpectedTitleFromAuth(username_digest_, password_), title);
 }
 
 // Test that cancelling authentication works.
 TEST_F(LoginPromptTest, TestCancelAuth) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
   ::scoped_ptr<TabProxy> 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());
   EXPECT_EQ(L"Denied: no auth", GetActiveTabTitle());
 }