SSL in EmbeddedTestServer

content/public/test/browser_test_base.cc

 // Copyright (c) 2011 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 "content/public/test/browser_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/i18n/icu_util.h"
@@ skipping 142 matching lines @@
 
 #if defined(OS_POSIX)
   handle_sigterm_ = true;
 #endif
 
   // This is called through base::TestSuite initially. It'll also be called
   // inside BrowserMain, so tell the code to ignore the check that it's being
   // 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 "
                            "developer has overridden the method and not called "
                            "the superclass version. In this case, the test "
                            "does not run and reports a false positive result.";
 }
 
 void BrowserTestBase::SetUp() {
   set_up_called_ = true;
@@ skipping 135 matching lines @@
         TracingControllerImpl::CreateFileSink(
             trace_file,
             base::Bind(&TraceDisableRecordingComplete,
                        run_loop.QuitClosure(),
                        trace_file)));
     run_loop.Run();
   }
 }
 
 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(
     const base::Closure& task) {
   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSingleProcess));
 
   scoped_refptr<MessageLoopRunner> runner = new MessageLoopRunner;
 
   base::MessageLoop* renderer_loop =
@@ skipping 12 matching lines @@
   use_software_compositing_ = true;
 }
 
 bool BrowserTestBase::UsingOSMesa() const {
   base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
   return cmd->GetSwitchValueASCII(switches::kUseGL) ==
          gfx::kGLImplementationOSMesaName;
 }
 
 }  // namespace content