summaryrefslogtreecommitdiffstats
path: root/net/test
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-23 03:18:19 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-23 03:18:19 +0000
commitc4ecdcf9dca8e16a46f327318b1994f19ca3dbef (patch)
tree7cd42bf61fe4265ed0d5ca2e2a5da405917753ac /net/test
parent99d228b720af4d2f7f9e1a9afec5d45c9b97e89a (diff)
downloadchromium_src-c4ecdcf9dca8e16a46f327318b1994f19ca3dbef.zip
chromium_src-c4ecdcf9dca8e16a46f327318b1994f19ca3dbef.tar.gz
chromium_src-c4ecdcf9dca8e16a46f327318b1994f19ca3dbef.tar.bz2
Reconstructing 67000.
(python24 -> python26). Regression in nacl fixed, new DEPS change. BUG=None TEST=NOne Review URL: http://codereview.chromium.org/5310001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67057 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
-rw-r--r--net/test/python_utils.cc2
-rw-r--r--net/test/test_server_win.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/test/python_utils.cc b/net/test/python_utils.cc
index 13438f7..0c61b48 100644
--- a/net/test/python_utils.cc
+++ b/net/test/python_utils.cc
@@ -70,7 +70,7 @@ bool GetPythonRunTime(FilePath* dir) {
if (!PathService::Get(base::DIR_SOURCE_ROOT, dir))
return false;
*dir = dir->Append(FILE_PATH_LITERAL("third_party"))
- .Append(FILE_PATH_LITERAL("python_24"))
+ .Append(FILE_PATH_LITERAL("python_26"))
.Append(FILE_PATH_LITERAL("python.exe"));
#elif defined(OS_POSIX)
*dir = FilePath("python");
diff --git a/net/test/test_server_win.cc b/net/test/test_server_win.cc
index 64437cd..a363755 100644
--- a/net/test/test_server_win.cc
+++ b/net/test/test_server_win.cc
@@ -96,7 +96,7 @@ bool TestServer::LaunchPython(const FilePath& testserver_path) {
return false;
python_exe = python_exe
.Append(FILE_PATH_LITERAL("third_party"))
- .Append(FILE_PATH_LITERAL("python_24"))
+ .Append(FILE_PATH_LITERAL("python_26"))
.Append(FILE_PATH_LITERAL("python.exe"));
CommandLine python_command(python_exe);