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

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

Issue 520303003: Change base/file_utils.h includes to base/files/file_utils.h in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/command_line.h" 8 #include "base/command_line.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_util.h"
11 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/files/file_util.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 16
17 const char kPythonPathEnv[] = "PYTHONPATH"; 17 const char kPythonPathEnv[] = "PYTHONPATH";
18 18
19 void AppendToPythonPath(const base::FilePath& dir) { 19 void AppendToPythonPath(const base::FilePath& dir) {
20 scoped_ptr<base::Environment> env(base::Environment::Create()); 20 scoped_ptr<base::Environment> env(base::Environment::Create());
21 std::string old_path; 21 std::string old_path;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 DCHECK(python_cmd); 110 DCHECK(python_cmd);
111 111
112 python_cmd->SetProgram(base::FilePath(FILE_PATH_LITERAL("python"))); 112 python_cmd->SetProgram(base::FilePath(FILE_PATH_LITERAL("python")));
113 113
114 // Launch python in unbuffered mode, so that python output doesn't mix with 114 // Launch python in unbuffered mode, so that python output doesn't mix with
115 // gtest output in buildbot log files. See http://crbug.com/147368. 115 // gtest output in buildbot log files. See http://crbug.com/147368.
116 python_cmd->AppendArg("-u"); 116 python_cmd->AppendArg("-u");
117 117
118 return true; 118 return true;
119 } 119 }
OLDNEW
« no previous file with comments | « net/test/embedded_test_server/embedded_test_server.cc ('k') | net/test/spawned_test_server/base_test_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698