Switching chrome to use python26 in place of python24.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/5121009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67000 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 12 insertions, 12 deletions

diff --git a/DEPS b/DEPS
index 3ce184c..c4538a4 100644
--- a/DEPS
+++ b/DEPS
@@ -8,7 +8,7 @@ vars = {
   "skia_revision": "626",
   "chromium_git": "http://git.chromium.org/git",
   "swig_revision": "40423",
-  "nacl_revision": "3664",
+  "nacl_revision": "3722",
   "libjingle_revision": "50",
   "libvpx_revision": "65287",
   "ffmpeg_revision": "66222",
@@ -189,10 +189,10 @@ deps_os = {
       "/trunk/deps/reference_builds/chrome@41984",
 
     "src/third_party/cygwin":
-      "/trunk/deps/third_party/cygwin@11984",
+      "/trunk/deps/third_party/cygwin@66844",
 
-    "src/third_party/python_24":
-      "/trunk/deps/third_party/python_24@22967",
+    "src/third_party/python_26":
+      "/trunk/tools/third_party/python_26@66685",
 
     "src/third_party/lighttpd":
       "/trunk/deps/third_party/lighttpd@33727",
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index e92459c..34c444c 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -203,7 +203,7 @@ TEST_F(ProcessUtilTest, GetAppOutput) {
   FilePath python_runtime;
   ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &python_runtime));
   python_runtime = python_runtime.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 cmd_line(python_runtime);
diff --git a/ceee/common.gypi b/ceee/common.gypi
index 88a8476..5f668f4 100644
--- a/ceee/common.gypi
+++ b/ceee/common.gypi
@@ -7,7 +7,7 @@
     'conditions': [
       ['OS=="win"', {
         'python': [
-          '<(DEPTH)\\third_party\\python_24\\setup_env.bat && python'
+          '<(DEPTH)\\third_party\\python_26\\setup_env.bat && python'
         ],
       }, { # OS != win
         'python': [
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0fa2ecd..e692de7a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3179,11 +3179,11 @@
             ['OS=="win"', {
               'include_dirs': [
                 '..',
-                '../third_party/python_24/include',
+                '../third_party/python_26/include',
               ],
               'link_settings': {
                 'libraries': [
-                  '../third_party/python_24/libs/python24.lib',
+                  '../third_party/python_26/libs/python26.lib',
                 ],
               }
             }],
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index e8b334a..39d5063 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -31,7 +31,7 @@
     'conditions': [
       ['OS=="win"', {
         'python': [
-          '<(DEPTH)\\third_party\\python_24\\setup_env.bat && python'
+          '<(DEPTH)\\third_party\\python_26\\setup_env.bat && python'
         ],
       }, { # OS != win
         'python': [
diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp
index 02a03f1..cafe850 100644
--- a/chrome_frame/chrome_frame_launcher.gyp
+++ b/chrome_frame/chrome_frame_launcher.gyp
@@ -20,7 +20,7 @@
     'conditions': [
       ['OS=="win"', {
         'python': [
-          '<(DEPTH)\\third_party\\python_24\\setup_env.bat && python'
+          '<(DEPTH)\\third_party\\python_26\\setup_env.bat && python'
         ],
       }, { # OS != win
         'python': [
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);