content/public/test/content_browser_test.cc - Issue 1376593007: SSL in EmbeddedTestServer

Unified Diff: content/public/test/content_browser_test.cc

Issue 1376593007: SSL in EmbeddedTestServer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/public/test/content_browser_test.cc

diff --git a/content/public/test/content_browser_test.cc b/content/public/test/content_browser_test.cc

index 6bcea4c64f5e2ba99e35b61a8610d21d9efe60cd..9fb7b125a38a5937946053afc4dd5537d4fad5ca 100644

--- a/content/public/test/content_browser_test.cc

+++ b/content/public/test/content_browser_test.cc

@@ -19,7 +19,6 @@

#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"

@@ -47,11 +46,6 @@ ContentBrowserTest::ContentBrowserTest() {

#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

mmenke 2015/10/13 19:55:50 Hrm....I don't think we want every test calling Pa

svaldez 2015/10/13 20:54:43 The default handler serves files based on DIR_SOUR

}

ContentBrowserTest::~ContentBrowserTest() {