Revert 7508.7509 and 7510

chrome/browser/ssl_uitest.cc

Index: chrome/browser/ssl_uitest.cc
===================================================================
--- chrome/browser/ssl_uitest.cc	(revision 7513)
+++ chrome/browser/ssl_uitest.cc	(working copy)
@@ -41,17 +41,17 @@
     EXPECT_TRUE(browser_proxy->AppendTab(url));
   }
 
-  HTTPTestServer* PlainServer() {
-    return HTTPTestServer::CreateServer(kDocRoot);
+  TestServer* PlainServer() {
+    return new TestServer(kDocRoot);
   }
 
   HTTPSTestServer* GoodCertServer() {
-    return HTTPSTestServer::CreateServer(util_.kHostName, util_.kOKHTTPSPort,
+    return new HTTPSTestServer(util_.kHostName, util_.kOKHTTPSPort,
         kDocRoot, util_.GetOKCertPath().ToWStringHack());
   }
 
   HTTPSTestServer* BadCertServer() {
-    return HTTPSTestServer::CreateServer(util_.kHostName, util_.kBadHTTPSPort,
+    return new HTTPSTestServer(util_.kHostName, util_.kBadHTTPSPort,
         kDocRoot, util_.GetExpiredCertPath().ToWStringHack());
   }
 
@@ -65,7 +65,7 @@
 
 // Visits a regular page over http.
 TEST_F(SSLUITest, TestHTTP) {
-  scoped_ptr<HTTPTestServer> server(PlainServer());
+  scoped_ptr<TestServer> server(PlainServer());
 
   scoped_ptr<TabProxy> tab(GetActiveTabProxy());
   NavigateTab(tab.get(), server->TestServerPageW(L"files/ssl/google.html"));
@@ -87,7 +87,7 @@
 // Visits a page over http which includes broken https resources (status should
 // be OK).
 TEST_F(SSLUITest, TestHTTPWithBrokenHTTPSResource) {
-  scoped_ptr<HTTPTestServer> http_server(PlainServer());
+  scoped_ptr<TestServer> http_server(PlainServer());
   scoped_ptr<HTTPSTestServer> bad_https_server(BadCertServer());
   scoped_ptr<TabProxy> tab(GetActiveTabProxy());
 
@@ -164,7 +164,7 @@
 // Visits a page with mixed content.
 TEST_F(SSLUITest, TestMixedContents) {
   scoped_ptr<HTTPSTestServer> https_server(GoodCertServer());
-  scoped_ptr<HTTPTestServer> http_server(PlainServer());
+  scoped_ptr<TestServer> http_server(PlainServer());
 
   // Load a page with mixed-content, the default behavior is to show the mixed
   // content.
@@ -286,7 +286,7 @@
 // Visits a page with mixed content loaded by JS (after the initial page load).
 TEST_F(SSLUITest, TestMixedContentsLoadedFromJS) {
   scoped_ptr<HTTPSTestServer> https_server(GoodCertServer());
-  scoped_ptr<HTTPTestServer> http_server(PlainServer());
+  scoped_ptr<TestServer> http_server(PlainServer());
 
   scoped_ptr<TabProxy> tab(GetActiveTabProxy());
   NavigateTab(tab.get(), https_server->TestServerPageW(
@@ -325,7 +325,7 @@
 // memory cache).
 TEST_F(SSLUITest, TestCachedMixedContents) {
   scoped_ptr<HTTPSTestServer> https_server(GoodCertServer());
-  scoped_ptr<HTTPTestServer> http_server(PlainServer());
+  scoped_ptr<TestServer> http_server(PlainServer());
 
   scoped_ptr<TabProxy> tab(GetActiveTabProxy());
   NavigateTab(tab.get(), http_server->TestServerPageW(
@@ -364,10 +364,9 @@
 // TODO(jcampan): this test is flacky and fails sometimes (bug #1065095)
 TEST_F(SSLUITest, DISABLED_TestCNInvalidStickiness) {
   const std::string kLocalHost = "localhost";
-  scoped_refptr<HTTPSTestServer> https_server =
-      HTTPSTestServer::CreateServer(kLocalHost, util_.kOKHTTPSPort,
-      kDocRoot, util_.GetOKCertPath().ToWStringHack());
-  ASSERT_TRUE(NULL != https_server.get());
+  scoped_ptr<HTTPSTestServer> https_server(
+    new HTTPSTestServer(kLocalHost, util_.kOKHTTPSPort,
+    kDocRoot, util_.GetOKCertPath().ToWStringHack()));
 
   // First we hit the server with hostname, this generates an invalid policy
   // error.
@@ -476,7 +475,7 @@
 // (bug #1966).
 // Disabled because flaky (bug #2136).
 TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) {
-  scoped_ptr<HTTPTestServer> http_server(PlainServer());
+  scoped_ptr<TestServer> http_server(PlainServer());
   scoped_ptr<HTTPSTestServer> bad_https_server(BadCertServer());
 
   scoped_ptr<TabProxy> tab(GetActiveTabProxy());
@@ -562,7 +561,7 @@
 // Visit a page over http that is a redirect to a page with https (good and
 // bad).
 TEST_F(SSLUITest, TestRedirectHTTPToHTTPS) {
-  scoped_ptr<HTTPTestServer> http_server(PlainServer());
+  scoped_ptr<TestServer> http_server(PlainServer());
   scoped_ptr<HTTPSTestServer> good_https_server(GoodCertServer());
   scoped_ptr<HTTPSTestServer> bad_https_server(BadCertServer());
 
@@ -605,7 +604,7 @@
 // Visit a page over https that is a redirect to a page with http (to make sure
 // we don't keep the secure state).
 TEST_F(SSLUITest, TestRedirectHTTPSToHTTP) {
-  scoped_ptr<HTTPTestServer> http_server(PlainServer());
+  scoped_ptr<TestServer> http_server(PlainServer());
   scoped_ptr<HTTPSTestServer> https_server(GoodCertServer());
 
   scoped_ptr<TabProxy> tab(GetActiveTabProxy());
@@ -661,7 +660,7 @@
 //   back
 // - navigate to HTTP (expect mixed content), then back
 TEST_F(SSLUITest, TestGoodFrameNavigation) {
-  scoped_ptr<HTTPTestServer> http_server(PlainServer());
+  scoped_ptr<TestServer> http_server(PlainServer());
   scoped_ptr<HTTPSTestServer> good_https_server(GoodCertServer());
   scoped_ptr<HTTPSTestServer> bad_https_server(BadCertServer());
 
@@ -799,7 +798,7 @@
 // From an HTTP top frame, navigate to good and bad HTTPS (security state should
 // stay unauthenticated).
 TEST_F(SSLUITest, TestUnauthenticatedFrameNavigation) {
-  scoped_ptr<HTTPTestServer> http_server(PlainServer());
+  scoped_ptr<TestServer> http_server(PlainServer());
   scoped_ptr<HTTPSTestServer> good_https_server(GoodCertServer());
   scoped_ptr<HTTPSTestServer> bad_https_server(BadCertServer());