SSL in EmbeddedTestServer

content/public/test/browser_test_base.h

Index: content/public/test/browser_test_base.h
diff --git a/content/public/test/browser_test_base.h b/content/public/test/browser_test_base.h
index 69b73c74b211e3e7507f1aba95ac63b9d05099af..781d836e530b1ba2348e66936e412c25b4052b74 100644
--- a/content/public/test/browser_test_base.h
+++ b/content/public/test/browser_test_base.h
@@ -8,6 +8,7 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/threading/thread.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -17,10 +18,6 @@ class FilePath;
 }
 
 namespace net {
-namespace test_server {
-class EmbeddedTestServer;
-}
-
 class RuleBasedHostResolverProc;
 }  // namespace net
 
@@ -87,15 +84,22 @@ class BrowserTestBase : public testing::Test {
   // Returns the testing server. Guaranteed to be non-NULL.
   // TODO(phajdan.jr): Remove test_server accessor (http://crbug.com/96594).
   const net::SpawnedTestServer* test_server() const {
-    return test_server_.get();
+    return spawned_test_server_.get();
+  }
+  net::SpawnedTestServer* test_server() { return spawned_test_server_.get(); }
+
+  const net::SpawnedTestServer* spawned_test_server() const {
+    return spawned_test_server_.get();
+  }
+  net::SpawnedTestServer* spawned_test_server() {
+    return spawned_test_server_.get();
   }
-  net::SpawnedTestServer* test_server() { return test_server_.get(); }
 
   // Returns the embedded test server. Guaranteed to be non-NULL.
-  const net::test_server::EmbeddedTestServer* embedded_test_server() const {
+  const net::EmbeddedTestServer* embedded_test_server() const {
     return embedded_test_server_.get();
   }
-  net::test_server::EmbeddedTestServer* embedded_test_server() {
+  net::EmbeddedTestServer* embedded_test_server() {
     return embedded_test_server_.get();
   }
 
@@ -134,10 +138,10 @@ class BrowserTestBase : public testing::Test {
   void ProxyRunTestOnMainThreadLoop();
 
   // Testing server, started on demand.
-  scoped_ptr<net::SpawnedTestServer> test_server_;
+  scoped_ptr<net::SpawnedTestServer> spawned_test_server_;
 
   // Embedded test server, cheap to create, started on demand.
-  scoped_ptr<net::test_server::EmbeddedTestServer> embedded_test_server_;
+  scoped_ptr<net::EmbeddedTestServer> embedded_test_server_;
 
   // Host resolver used during tests.
   scoped_refptr<net::RuleBasedHostResolverProc> rule_based_resolver_;