Revert of SSL in EmbeddedTestServer

content/public/test/browser_test_base.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
 #define CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
 
 #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"
 
 namespace base {
 class CommandLine;
 class FilePath;
 }
 
 namespace net {
+namespace test_server {
+class EmbeddedTestServer;
+}
+
 class RuleBasedHostResolverProc;
 }  // namespace net
 
 namespace content {
 
 class BrowserTestBase : public testing::Test {
  public:
   BrowserTestBase();
   ~BrowserTestBase() override;
 
@@ skipping 46 matching lines @@
   // This prepares for the test by creating a new browser, runs the test
   // (RunTestOnMainThread), quits the browsers and returns.
   virtual void RunTestOnMainThreadLoop() = 0;
 
   // Sets expected browser exit code, in case it's different than 0 (success).
   void set_expected_exit_code(int code) { expected_exit_code_ = code; }
 
   // 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 spawned_test_server_.get();
+    return 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::EmbeddedTestServer* embedded_test_server() const {
+  const net::test_server::EmbeddedTestServer* embedded_test_server() const {
     return embedded_test_server_.get();
   }
-  net::EmbeddedTestServer* embedded_test_server() {
+  net::test_server::EmbeddedTestServer* embedded_test_server() {
     return embedded_test_server_.get();
   }
 
 #if defined(OS_POSIX)
   // This is only needed by a test that raises SIGTERM to ensure that a specific
   // codepath is taken.
   void DisableSIGTERMHandling() {
     handle_sigterm_ = false;
   }
 #endif
@@ skipping 18 matching lines @@
   // instead.
   void UseSoftwareCompositing();
 
   // Returns true if the test will be using GL acceleration via OSMesa.
   bool UsingOSMesa() const;
 
  private:
   void ProxyRunTestOnMainThreadLoop();
 
   // Testing server, started on demand.
-  scoped_ptr<net::SpawnedTestServer> spawned_test_server_;
+  scoped_ptr<net::SpawnedTestServer> test_server_;
 
   // Embedded test server, cheap to create, started on demand.
-  scoped_ptr<net::EmbeddedTestServer> embedded_test_server_;
+  scoped_ptr<net::test_server::EmbeddedTestServer> embedded_test_server_;
 
   // Host resolver used during tests.
   scoped_refptr<net::RuleBasedHostResolverProc> rule_based_resolver_;
 
   // Expected exit code (default is 0).
   int expected_exit_code_;
 
   // When true, the compositor will produce pixel output that can be read back
   // for pixel tests.
   bool enable_pixel_output_;
 
   // When true, do compositing with the software backend instead of using GL.
   bool use_software_compositing_;
 
   // Whether SetUp was called. This value is checked in the destructor of this
   // class to ensure that SetUp was called. If it's not called, the test will
   // not run and report a false positive result.
   bool set_up_called_;
 
 #if defined(OS_POSIX)
   bool handle_sigterm_;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_