| Index: content/public/test/test_launcher.cc
|
| diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc
|
| index 178366d97f1c2be2f68b9117b7aa0c20bc69997b..90e3b385e36606c43de40437232be78346c3fe6d 100644
|
| --- a/content/public/test/test_launcher.cc
|
| +++ b/content/public/test/test_launcher.cc
|
| @@ -68,7 +68,7 @@ const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS";
|
| const char kTestShardIndex[] = "GTEST_SHARD_INDEX";
|
|
|
| // The default output file for XML output.
|
| -const FilePath::CharType kDefaultOutputFile[] = FILE_PATH_LITERAL(
|
| +const base::FilePath::CharType kDefaultOutputFile[] = FILE_PATH_LITERAL(
|
| "test_detail.xml");
|
|
|
| // Quit test execution after this number of tests has timed out.
|
| @@ -166,23 +166,24 @@ ResultsPrinter::ResultsPrinter(const CommandLine& command_line) : out_(NULL) {
|
| return;
|
| std::string flag = command_line.GetSwitchValueASCII(kGTestOutputFlag);
|
| size_t colon_pos = flag.find(':');
|
| - FilePath path;
|
| + base::FilePath path;
|
| if (colon_pos != std::string::npos) {
|
| - FilePath flag_path = command_line.GetSwitchValuePath(kGTestOutputFlag);
|
| - FilePath::StringType path_string = flag_path.value();
|
| - path = FilePath(path_string.substr(colon_pos + 1));
|
| + base::FilePath flag_path =
|
| + command_line.GetSwitchValuePath(kGTestOutputFlag);
|
| + base::FilePath::StringType path_string = flag_path.value();
|
| + path = base::FilePath(path_string.substr(colon_pos + 1));
|
| // If the given path ends with '/', consider it is a directory.
|
| // Note: This does NOT check that a directory (or file) actually exists
|
| // (the behavior is same as what gtest does).
|
| if (file_util::EndsWithSeparator(path)) {
|
| - FilePath executable = command_line.GetProgram().BaseName();
|
| + base::FilePath executable = command_line.GetProgram().BaseName();
|
| path = path.Append(executable.ReplaceExtension(
|
| - FilePath::StringType(FILE_PATH_LITERAL("xml"))));
|
| + base::FilePath::StringType(FILE_PATH_LITERAL("xml"))));
|
| }
|
| }
|
| if (path.value().empty())
|
| - path = FilePath(kDefaultOutputFile);
|
| - FilePath dir_name = path.DirName();
|
| + path = base::FilePath(kDefaultOutputFile);
|
| + base::FilePath dir_name = path.DirName();
|
| if (!file_util::DirectoryExists(dir_name)) {
|
| LOG(WARNING) << "The output directory does not exist. "
|
| << "Creating the directory: " << dir_name.value();
|
|
|