Fix more remaining FilePath -> base::FilePath.

chrome/installer/launcher_support/chrome_launcher_support.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 "chrome/installer/launcher_support/chrome_launcher_support.h"
 
 #include <windows.h>
 #include <tchar.h>
 
 #include "base/command_line.h"
@@ skipping 27 matching lines @@
 const wchar_t kBrowserAppGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}";
 
 // Copied from util_constants.cc.
 const wchar_t kChromeAppHostExe[] = L"app_host.exe";
 const char kChromeAppLauncher[] = "app-launcher";
 const wchar_t kChromeExe[] = L"chrome.exe";
 const wchar_t kUninstallArgumentsField[] = L"UninstallArguments";
 const wchar_t kUninstallStringField[] = L"UninstallString";
 
 #ifndef OFFICIAL_BUILD
-FilePath GetDevelopmentExe(const wchar_t* exe_file) {
+base::FilePath GetDevelopmentExe(const wchar_t* exe_file) {
   base::FilePath current_directory;
   if (PathService::Get(base::DIR_EXE, &current_directory)) {
     base::FilePath chrome_exe_path(current_directory.Append(exe_file));
     if (file_util::PathExists(chrome_exe_path))
       return chrome_exe_path;
   }
   return base::FilePath();
 }
 #endif
 
@@ skipping 41 matching lines @@
     return CommandLine::FromString(L"dummy.exe " + uninstall_arguments)
         .HasSwitch(kChromeAppLauncher) &&
         !GetAppHostPathForInstallationLevel(level).empty();
   }
   return false;
 }
 
 // Reads the path to setup.exe from the value "UninstallString" within the
 // specified product's "ClientState" registry key. Returns an empty FilePath if
 // an error occurs or the product is not installed at the specified level.
-FilePath GetSetupExeFromRegistry(InstallationLevel level,
-                                 const wchar_t* app_guid) {
+base::FilePath GetSetupExeFromRegistry(InstallationLevel level,
+                                       const wchar_t* app_guid) {
   string16 uninstall;
   if (GetClientStateValue(level, app_guid, kUninstallStringField, &uninstall)) {
     base::FilePath setup_exe_path(uninstall);
     if (file_util::PathExists(setup_exe_path))
       return setup_exe_path;
   }
   return base::FilePath();
 }
 
 // Returns the path to an installed |exe_file| (e.g. chrome.exe, app_host.exe)
 // at the specified level, given |setup_exe_path| from Omaha client state.
 // Returns empty base::FilePath if none found, or if |setup_exe_path| is empty.
-FilePath FindExeRelativeToSetupExe(const base::FilePath setup_exe_path,
-                                   const wchar_t* exe_file) {
+base::FilePath FindExeRelativeToSetupExe(const base::FilePath setup_exe_path,
+                                         const wchar_t* exe_file) {
   if (!setup_exe_path.empty()) {
     // The uninstall path contains the path to setup.exe, which is two levels
     // down from |exe_file|. Move up two levels (plus one to drop the file
     // name) and look for chrome.exe from there.
     base::FilePath exe_path(
         setup_exe_path.DirName().DirName().DirName().Append(exe_file));
     if (file_util::PathExists(exe_path))
       return exe_path;
     // By way of mild future proofing, look up one to see if there's a
     // |exe_file| in the version directory
     exe_path = setup_exe_path.DirName().DirName().Append(exe_file);
     if (file_util::PathExists(exe_path))
       return exe_path;
   }
   return base::FilePath();
 }
 
 }  // namespace
 
-FilePath GetSetupExeForInstallationLevel(InstallationLevel level) {
+base::FilePath GetSetupExeForInstallationLevel(InstallationLevel level) {
   // Look in the registry for Chrome Binaries first.
   base::FilePath setup_exe_path(
       GetSetupExeFromRegistry(level, kBinariesAppGuid));
   // If the above fails, look in the registry for Chrome next.
   if (setup_exe_path.empty())
     setup_exe_path = GetSetupExeFromRegistry(level, kBrowserAppGuid);
   // If we fail again, then setup_exe_path would be empty.
   return setup_exe_path;
 }
 
-FilePath GetChromePathForInstallationLevel(InstallationLevel level) {
+base::FilePath GetChromePathForInstallationLevel(InstallationLevel level) {
   return FindExeRelativeToSetupExe(
       GetSetupExeForInstallationLevel(level), kChromeExe);
 }
 
-FilePath GetAppHostPathForInstallationLevel(InstallationLevel level) {
+base::FilePath GetAppHostPathForInstallationLevel(InstallationLevel level) {
   return FindExeRelativeToSetupExe(
       GetSetupExeFromRegistry(level, kAppHostAppId), kChromeAppHostExe);
 }
 
-FilePath GetAnyChromePath() {
+base::FilePath GetAnyChromePath() {
   base::FilePath chrome_path;
 #ifndef OFFICIAL_BUILD
   // For development mode, chrome.exe should be in same dir as the stub.
   chrome_path = GetDevelopmentExe(kChromeExe);
 #endif
   if (chrome_path.empty())
     chrome_path = GetChromePathForInstallationLevel(SYSTEM_LEVEL_INSTALLATION);
   if (chrome_path.empty())
     chrome_path = GetChromePathForInstallationLevel(USER_LEVEL_INSTALLATION);
   return chrome_path;
 }
 
-FilePath GetAnyAppHostPath() {
+base::FilePath GetAnyAppHostPath() {
   base::FilePath app_host_path;
 #ifndef OFFICIAL_BUILD
   // For development mode, app_host.exe should be in same dir as chrome.exe.
   app_host_path = GetDevelopmentExe(kChromeAppHostExe);
 #endif
   if (app_host_path.empty()) {
     app_host_path = GetAppHostPathForInstallationLevel(
         SYSTEM_LEVEL_INSTALLATION);
   }
   if (app_host_path.empty())
@@ skipping 10 matching lines @@
   return IsAppLauncherEnabledAtLevel(USER_LEVEL_INSTALLATION) ||
       IsAppLauncherEnabledAtLevel(SYSTEM_LEVEL_INSTALLATION);
 }
 
 bool IsChromeBrowserPresent() {
   return IsProductInstalled(USER_LEVEL_INSTALLATION, kBrowserAppGuid) ||
       IsProductInstalled(SYSTEM_LEVEL_INSTALLATION, kBrowserAppGuid);
 }
 
 }  // namespace chrome_launcher_support