chrome/test/base/in_process_browser_test.cc - Issue 16268017: GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/base/in_process_browser_test.cc

Issue 16268017: GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: compile Created 7 years, 6 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/pdf/pdf_browsertest.cc ('k') | chrome/test/data/extensions/api_test/app_background_page/basic/test.js » ('j') | net/http/http_status_code_list.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/base/in_process_browser_test.cc

diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc

index 293c4c8bbd9ada11bd10a41f00021704be8b97ba..36faaa0042bd061395e99e907c80a066ddb9caae 100644

--- a/chrome/test/base/in_process_browser_test.cc

+++ b/chrome/test/base/in_process_browser_test.cc

@@ -46,6 +46,7 @@

#include "content/public/test/test_launcher.h"

#include "content/public/test/test_navigation_observer.h"

#include "net/dns/mock_host_resolver.h"

+#include "net/test/embedded_test_server/embedded_test_server.h"

#include "net/test/spawned_test_server/spawned_test_server.h"

#include "ui/compositor/compositor_switches.h"

@@ -99,6 +100,10 @@ InProcessBrowserTest::InProcessBrowserTest()

CHECK(PathService::Override(base::FILE_EXE, chrome_path));

#endif // defined(OS_MACOSX)

CreateTestServer(base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));

+ base::FilePath src_dir;

+ CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &src_dir));

+ embedded_test_server()->ServeFilesFromDirectory(

+ src_dir.AppendASCII("chrome/test/data"));

}

InProcessBrowserTest::~InProcessBrowserTest() {