Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(892)

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: Better comments. Created 7 years, 3 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 | « no previous file | net/test/spawned_test_server/local_test_server_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/python_utils.cc
diff --git a/net/test/python_utils.cc b/net/test/python_utils.cc
index 30c5f679a8adeed79b2d28d2232f4ad9478ff613..a9ac98b53171b7cad2b80d547dca9baec5719353 100644
--- a/net/test/python_utils.cc
+++ b/net/test/python_utils.cc
@@ -106,18 +106,8 @@ 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
- python_cmd->SetProgram(dir);
+ python_cmd->SetProgram(base::FilePath(FILE_PATH_LITERAL("python")));
// Launch python in unbuffered mode, so that python output doesn't mix with
// gtest output in buildbot log files. See http://crbug.com/147368.
« no previous file with comments | « no previous file | net/test/spawned_test_server/local_test_server_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698