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

Side by Side Diff: testing/android/native_test_util.cc

Issue 19579005: Move ReadFileToString to the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « skia/ext/vector_canvas_unittest.cc ('k') | third_party/zlib/google/zip_reader_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "testing/android/native_test_util.h" 5 #include "testing/android/native_test_util.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/strings/string_tokenizer.h" 9 #include "base/strings/string_tokenizer.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 13 matching lines...) Expand all
24 24
25 } // namespace 25 } // namespace
26 26
27 namespace testing { 27 namespace testing {
28 namespace native_test_util { 28 namespace native_test_util {
29 29
30 void ParseArgsFromCommandLineFile( 30 void ParseArgsFromCommandLineFile(
31 const char* path, std::vector<std::string>* args) { 31 const char* path, std::vector<std::string>* args) {
32 base::FilePath command_line(path); 32 base::FilePath command_line(path);
33 std::string command_line_string; 33 std::string command_line_string;
34 if (file_util::ReadFileToString(command_line, &command_line_string)) { 34 if (base::ReadFileToString(command_line, &command_line_string)) {
35 ParseArgsFromString(command_line_string, args); 35 ParseArgsFromString(command_line_string, args);
36 } 36 }
37 } 37 }
38 38
39 int ArgsToArgv(const std::vector<std::string>& args, 39 int ArgsToArgv(const std::vector<std::string>& args,
40 std::vector<char*>* argv) { 40 std::vector<char*>* argv) {
41 // We need to pass in a non-const char**. 41 // We need to pass in a non-const char**.
42 int argc = args.size(); 42 int argc = args.size();
43 43
44 argv->resize(argc + 1); 44 argv->resize(argc + 1);
45 for (int i = 0; i < argc; ++i) { 45 for (int i = 0; i < argc; ++i) {
46 (*argv)[i] = const_cast<char*>(args[i].c_str()); 46 (*argv)[i] = const_cast<char*>(args[i].c_str());
47 } 47 }
48 (*argv)[argc] = NULL; // argv must be NULL terminated. 48 (*argv)[argc] = NULL; // argv must be NULL terminated.
49 49
50 return argc; 50 return argc;
51 } 51 }
52 52
53 } // namespace native_test_util 53 } // namespace native_test_util
54 } // namespace testing 54 } // namespace testing
OLDNEW
« no previous file with comments | « skia/ext/vector_canvas_unittest.cc ('k') | third_party/zlib/google/zip_reader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698