SSL in EmbeddedTestServer

content/public/test/content_browser_test.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/content_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "content/shell/browser/shell_content_browser_client.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client.h"
 #include "content/test/test_content_client.h"
-#include "net/test/embedded_test_server/embedded_test_server.h"
 
 #if defined(OS_ANDROID)
 #include "content/shell/app/shell_main_delegate.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 
 #if !defined(OS_CHROMEOS) && defined(OS_LINUX)
 #include "ui/base/ime/input_method_initializer.h"
 #endif
 
 namespace content {
 
 ContentBrowserTest::ContentBrowserTest() {
 #if defined(OS_MACOSX)
   // See comment in InProcessBrowserTest::InProcessBrowserTest().
   base::FilePath content_shell_path;
   CHECK(PathService::Get(base::FILE_EXE, &content_shell_path));
   content_shell_path = content_shell_path.DirName();
   content_shell_path = content_shell_path.Append(
       FILE_PATH_LITERAL("Content Shell.app/Contents/MacOS/Content Shell"));
   CHECK(PathService::Override(base::FILE_EXE, content_shell_path));
 #endif
   base::FilePath content_test_data(FILE_PATH_LITERAL("content/test/data"));
   CreateTestServer(content_test_data);
-  base::FilePath content_test_data_absolute;
-  CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &content_test_data_absolute));
-  content_test_data_absolute =
-      content_test_data_absolute.Append(content_test_data);
-  embedded_test_server()->ServeFilesFromDirectory(content_test_data_absolute);

[davidben, 2015/10/13 19:43:47]

This is slightly different behavior than before. I think we do actually prefer
giving it an absolute path? Not sure. I had people complain at me before that
prerender browsertests were sensitive to cwd.

(The spawned test server is weird and mangles paths internally which I think is
why it wants a relative one.)

[mmenke, 2015/10/13 19:55:50]

Hrm....I don't think we want every test calling
PathService::Get(base::DIR_SOURCE_ROOT, &content_test_data_absolute), so we
should probably stick with the old behavior.

[svaldez, 2015/10/13 20:54:43]

The default handler serves files based on DIR_SOURCE_ROOT so it should be the
same behavior.

 }
 
 ContentBrowserTest::~ContentBrowserTest() {
 }
 
 void ContentBrowserTest::SetUp() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   command_line->AppendSwitch(switches::kContentBrowserTest);
 
   SetUpCommandLine(command_line);
@@ skipping 97 matching lines @@
 
 Shell* ContentBrowserTest::CreateOffTheRecordBrowser() {
   return Shell::CreateNewWindow(
       ShellContentBrowserClient::Get()->off_the_record_browser_context(),
       GURL(url::kAboutBlankURL),
       NULL,
       gfx::Size());
 }
 
 }  // namespace content