Add explicit base to FilePath.

content/shell/shell_content_browser_client.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.
 
 #include "content/shell/shell_content_browser_client.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 16 matching lines @@
 #include "base/android/path_utils.h"
 #include "base/path_service.h"
 #include "base/platform_file.h"
 #include "content/shell/android/shell_descriptors.h"
 #endif
 
 namespace content {
 
 namespace {
 
-FilePath GetWebKitRootDirFilePath() {
-  FilePath base_path;
+base::FilePath GetWebKitRootDirFilePath() {
+  base::FilePath base_path;
   PathService::Get(base::DIR_SOURCE_ROOT, &base_path);
   if (file_util::PathExists(
           base_path.Append(FILE_PATH_LITERAL("third_party/WebKit")))) {
     // We're in a WebKit-in-chrome checkout.
     return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit"));
   } else if (file_util::PathExists(
           base_path.Append(FILE_PATH_LITERAL("chromium")))) {
     // We're in a WebKit-only checkout on Windows.
     return base_path.Append(FILE_PATH_LITERAL("../.."));
   } else if (file_util::PathExists(
@@ skipping 79 matching lines @@
     return true;
   return WebKitTestController::Get()->CanOpenWindows();
 }
 
 #if defined(OS_ANDROID)
 void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const CommandLine& command_line,
     int child_process_id,
     std::vector<content::FileDescriptorInfo>* mappings) {
   int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ;
-  FilePath pak_file;
+  base::FilePath pak_file;
   bool r = PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_file);
   CHECK(r);
   pak_file = pak_file.Append(FILE_PATH_LITERAL("paks"));
   pak_file = pak_file.Append(FILE_PATH_LITERAL("content_shell.pak"));
 
   base::PlatformFile f =
       base::CreatePlatformFile(pak_file, flags, NULL, NULL);
   if (f == base::kInvalidPlatformFileValue) {
     NOTREACHED() << "Failed to open file when creating renderer process: "
                  << "content_shell.pak";
@@ skipping 11 matching lines @@
 ShellBrowserContext*
     ShellContentBrowserClient::off_the_record_browser_context() {
   return shell_browser_main_parts_->off_the_record_browser_context();
 }
 
 AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() {
   return new ShellAccessTokenStore(browser_context()->GetRequestContext());
 }
 
 }  // namespace content