Add explicit base to FilePath.

content/shell/shell_main_delegate.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_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 47 matching lines @@
 //    "default_level"=dword:00000004
 //    @="Content Shell"
 
 // {6A3E50A4-7E15-4099-8413-EC94D8C2A4B6}
 const GUID kContentShellProviderName = {
     0x6a3e50a4, 0x7e15, 0x4099,
         { 0x84, 0x13, 0xec, 0x94, 0xd8, 0xc2, 0xa4, 0xb6 } };
 #endif
 
 void InitLogging() {
-  FilePath log_filename;
+  base::FilePath log_filename;
   PathService::Get(base::DIR_EXE, &log_filename);
   log_filename = log_filename.AppendASCII("content_shell.log");
   logging::InitLogging(
       log_filename.value().c_str(),
       logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
       logging::LOCK_LOG_FILE,
       logging::DELETE_OLD_LOG_FILE,
       logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
   logging::SetLogItems(true, true, true, true);
 }
@@ skipping 72 matching lines @@
   int pak_fd =
       base::GlobalDescriptors::GetInstance()->MaybeGet(kShellPakDescriptor);
   if (pak_fd != base::kInvalidPlatformFileValue) {
     ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_fd, false);
     ResourceBundle::GetSharedInstance().AddDataPackFromFile(
         pak_fd, ui::SCALE_FACTOR_100P);
     return;
   }
 #endif
 
-  FilePath pak_file;
+  base::FilePath pak_file;
 #if defined(OS_MACOSX)
   pak_file = GetResourcesPakFilePath();
 #else
-  FilePath pak_dir;
+  base::FilePath pak_dir;
 
 #if defined(OS_ANDROID)
   bool got_path = PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_dir);
   DCHECK(got_path);
   pak_dir = pak_dir.Append(FILE_PATH_LITERAL("paks"));
 #else
   PathService::Get(base::DIR_MODULE, &pak_dir);
 #endif
 
   pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
 #endif
   ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
 }
 
 ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
   browser_client_.reset(new ShellContentBrowserClient);
   return browser_client_.get();
 }
 
 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
   renderer_client_.reset(new ShellContentRendererClient);
   return renderer_client_.get();
 }
 
 }  // namespace content