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

Side by Side Diff: net/test/python_utils.cc

Issue 5272001: Reverting 67000. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome_frame/chrome_frame_launcher.gyp ('k') | net/test/test_server_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/test/python_utils.h" 5 #include "net/test/python_utils.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #endif 63 #endif
64 *dir = generated_code_dir.Append(kPyProto); 64 *dir = generated_code_dir.Append(kPyProto);
65 return true; 65 return true;
66 } 66 }
67 67
68 bool GetPythonRunTime(FilePath* dir) { 68 bool GetPythonRunTime(FilePath* dir) {
69 #if defined(OS_WIN) 69 #if defined(OS_WIN)
70 if (!PathService::Get(base::DIR_SOURCE_ROOT, dir)) 70 if (!PathService::Get(base::DIR_SOURCE_ROOT, dir))
71 return false; 71 return false;
72 *dir = dir->Append(FILE_PATH_LITERAL("third_party")) 72 *dir = dir->Append(FILE_PATH_LITERAL("third_party"))
73 .Append(FILE_PATH_LITERAL("python_26")) 73 .Append(FILE_PATH_LITERAL("python_24"))
74 .Append(FILE_PATH_LITERAL("python.exe")); 74 .Append(FILE_PATH_LITERAL("python.exe"));
75 #elif defined(OS_POSIX) 75 #elif defined(OS_POSIX)
76 *dir = FilePath("python"); 76 *dir = FilePath("python");
77 #endif 77 #endif
78 return true; 78 return true;
79 } 79 }
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame_launcher.gyp ('k') | net/test/test_server_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698