Replace FilePath with base::FilePath.

content/shell/android/browsertests_apk/content_browser_tests_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This class sets up the environment for running the content browser tests
 // inside an android application.
 
 #include <android/log.h>
 
 #include "base/android/base_jni_registrar.h"
@@ skipping 55 matching lines @@
   ParseArgsFromCommandLineFile(kCommandLineFilePath, &args);
 
   std::vector<char*> argv;
   int argc = ArgsToArgv(args, &argv);
 
   // Fully initialize command line with arguments.
   CommandLine::ForCurrentProcess()->AppendArguments(
       CommandLine(argc, &argv[0]), false);
 
   // Create fifo and redirect stdout and stderr to it.
-  FilePath files_dir(base::android::ConvertJavaStringToUTF8(env, jfiles_dir));
-  FilePath fifo_path(files_dir.Append(FilePath("test.fifo")));
+  base::FilePath files_dir(
+      base::android::ConvertJavaStringToUTF8(env, jfiles_dir));
+  base::FilePath fifo_path(files_dir.Append(base::FilePath("test.fifo")));
   CreateFIFO(fifo_path.value().c_str());
   RedirectStream(stdout, fifo_path.value().c_str(), "w");
   dup2(STDOUT_FILENO, STDERR_FILENO);
 
   ScopedMainEntryLogger scoped_main_entry_logger;
   main(argc, &argv[0]);
 }
 }  // namespace content
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   base::android::InitVM(vm);
   JNIEnv* env = base::android::AttachCurrentThread();
 
   if (!content::RegisterLibraryLoaderEntryHook(env))
     return -1;
 
   if (!content::android::RegisterShellJni(env))
     return -1;
 
   if (!content::BrowserTestMessagePumpAndroid::RegisterJni(env))
     return -1;
 
   if (!content::RegisterNativesImpl(env))
     return -1;
 
   content::SetContentMainDelegate(new content::ShellMainDelegate());
   return JNI_VERSION_1_4;
 }