summaryrefslogtreecommitdiffstats
path: root/testing/android
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-18 06:14:59 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-18 06:14:59 +0000
commit631a54712d79c39bb7fbd322e3e4dc6b2429686d (patch)
treeecefa4d7d12d7dd79e489065c2555781bab9b5f5 /testing/android
parente541ac7357c2178ee785764ab0415f94f5ec9bd7 (diff)
downloadchromium_src-631a54712d79c39bb7fbd322e3e4dc6b2429686d.zip
chromium_src-631a54712d79c39bb7fbd322e3e4dc6b2429686d.tar.gz
chromium_src-631a54712d79c39bb7fbd322e3e4dc6b2429686d.tar.bz2
Fix more remaining FilePath -> base::FilePath.
This removes the "using" in file_path.h for Mac since Mac now passes trybots with no using. It still leaves the using for Windows. Review URL: https://codereview.chromium.org/12294008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/android')
-rw-r--r--testing/android/native_test_launcher.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test_launcher.cc
index 68bb5d1..a16b536 100644
--- a/testing/android/native_test_launcher.cc
+++ b/testing/android/native_test_launcher.cc
@@ -109,25 +109,26 @@ static void RunTests(JNIEnv* env,
CommandLine(argc, &argv[0]), false);
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
- FilePath files_dir(base::android::ConvertJavaStringToUTF8(env, jfiles_dir));
+ base::FilePath files_dir(
+ base::android::ConvertJavaStringToUTF8(env, jfiles_dir));
// A few options, such "--gtest_list_tests", will just use printf directly
// Always redirect stdout to a known file.
- FilePath fifo_path(files_dir.Append(FilePath("test.fifo")));
+ base::FilePath fifo_path(files_dir.Append(base::FilePath("test.fifo")));
CreateFIFO(fifo_path.value().c_str());
- FilePath stderr_fifo_path, stdin_fifo_path;
+ base::FilePath stderr_fifo_path, stdin_fifo_path;
// DumpRenderTree needs a separate fifo for the stderr output. For all
// other tests, insert stderr content to the same fifo we use for stdout.
if (command_line.HasSwitch(kSeparateStderrFifo)) {
- stderr_fifo_path = files_dir.Append(FilePath("stderr.fifo"));
+ stderr_fifo_path = files_dir.Append(base::FilePath("stderr.fifo"));
CreateFIFO(stderr_fifo_path.value().c_str());
}
// DumpRenderTree uses stdin to receive input about which test to run.
if (command_line.HasSwitch(kCreateStdinFifo)) {
- stdin_fifo_path = files_dir.Append(FilePath("stdin.fifo"));
+ stdin_fifo_path = files_dir.Append(base::FilePath("stdin.fifo"));
CreateFIFO(stdin_fifo_path.value().c_str());
}