net/test/python_utils.cc - Issue 21537002: Remove hard dependency on bundled python_26 in tests

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: net/test/python_utils.cc

Issue 21537002: Remove hard dependency on bundled python_26 in tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@glyphcache_20130604

Patch Set: Using Chromium Types and reusing code. Created 7 years, 5 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

Index: net/test/python_utils.cc

diff --git a/net/test/python_utils.cc b/net/test/python_utils.cc

index 30c5f679a8adeed79b2d28d2232f4ad9478ff613..8c0585605551b98fe87f210cf0d747de80078884 100644

--- a/net/test/python_utils.cc

+++ b/net/test/python_utils.cc

@@ -107,15 +107,7 @@ bool GetPyProtoPath(base::FilePath* dir) {

bool GetPythonCommand(CommandLine* python_cmd) {

DCHECK(python_cmd);

base::FilePath dir;

-#if defined(OS_WIN)

- if (!PathService::Get(base::DIR_SOURCE_ROOT, &dir))

- return false;

- dir = dir.Append(FILE_PATH_LITERAL("third_party"))

- .Append(FILE_PATH_LITERAL("python_26"))

- .Append(FILE_PATH_LITERAL("python.exe"));

-#elif defined(OS_POSIX)

- dir = base::FilePath("python");

-#endif

+ dir = base::FilePath(FILE_PATH_LITERAL("python"));

python_cmd->SetProgram(dir);

Paweł Hajdan Jr. 2013/08/19 19:16:56 nit: If it fits, just put FILE_PATH_LITERAL("pytho

« no previous file with comments | « no previous file | net/test/spawned_test_server/local_test_server_win.cc » ('j') | net/test/spawned_test_server/local_test_server_win.cc » ('J')