SSL in EmbeddedTestServer

content/public/test/browser_test_base.cc

Index: content/public/test/browser_test_base.cc
diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc
index 74efc959ba4bc5417fbb82eb5fd4e773bbe1bb57..22f9cdfdd0e47689552e0871a31428c4edad02ae 100644
--- a/content/public/test/browser_test_base.cc
+++ b/content/public/test/browser_test_base.cc
@@ -160,14 +160,14 @@ BrowserTestBase::BrowserTestBase()
   // called more than once
   base::i18n::AllowMultipleInitializeCallsForTesting();
 
-  embedded_test_server_.reset(new net::test_server::EmbeddedTestServer);
+  embedded_test_server_.reset(new net::EmbeddedTestServer);
 }
 
 BrowserTestBase::~BrowserTestBase() {
 #if defined(OS_ANDROID)
   // RemoteTestServer can cause wait on the UI thread.
   base::ThreadRestrictions::ScopedAllowWait allow_wait;
-  test_server_.reset(NULL);
+  spawned_test_server_.reset(NULL);
 #endif
 
   CHECK(set_up_called_) << "SetUp was not called. This probably means that the "
@@ -323,11 +323,11 @@ void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
 }
 
 void BrowserTestBase::CreateTestServer(const base::FilePath& test_server_base) {
-  CHECK(!test_server_.get());
-  test_server_.reset(new net::SpawnedTestServer(
-      net::SpawnedTestServer::TYPE_HTTP,
-      net::SpawnedTestServer::kLocalhost,
+  CHECK(!spawned_test_server_.get());
+  spawned_test_server_.reset(new net::SpawnedTestServer(
+      net::SpawnedTestServer::TYPE_HTTP, net::SpawnedTestServer::kLocalhost,
       test_server_base));
+  embedded_test_server()->AddDefaultHandlers(test_server_base);
 }
 
 void BrowserTestBase::PostTaskToInProcessRendererAndWait(