Disable "using base::FilePath" on Linux since it now compiles.

This keeps the using for other platforms temporarily. This patch is to "stop
the bleeding" since new conflicts are added every day. The other platforms will
be fixed in followup patches.

This also adds an exception for the MTPD code which has a circular dependency
on FilePath.

Review URL: https://codereview.chromium.org/12282019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183043 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 15 insertions, 12 deletions

diff --git a/chrome/installer/util/create_reg_key_work_item.cc b/chrome/installer/util/create_reg_key_work_item.cc
index 9b9aa9b..56c3571 100644
--- a/chrome/installer/util/create_reg_key_work_item.cc
+++ b/chrome/installer/util/create_reg_key_work_item.cc
@@ -17,11 +17,12 @@ namespace {
 
 // TODO: refactor this because it is only used once.
 void UpOneDirectoryOrEmpty(std::wstring* dir) {
-  FilePath path = FilePath::FromWStringHack(*dir);
-  FilePath directory = path.DirName();
+  base::FilePath path = base::FilePath::FromWStringHack(*dir);
+  base::FilePath directory = path.DirName();
   // If there is no separator, we will get back kCurrentDirectory.
   // In this case, clear dir.
-  if (directory == path || directory.value() == FilePath::kCurrentDirectory)
+  if (directory == path || directory.value() ==
+      base::FilePath::kCurrentDirectory)
     dir->clear();
   else
     *dir = directory.value();
diff --git a/chrome/installer/util/google_update_util.cc b/chrome/installer/util/google_update_util.cc
index 4c502fe..1d39d67 100644
--- a/chrome/installer/util/google_update_util.cc
+++ b/chrome/installer/util/google_update_util.cc
@@ -43,7 +43,7 @@ bool IsGoogleUpdatePresent(bool system_install) {
 
 // Returns GoogleUpdateSetup.exe's executable path at specified level.
 // or an empty path if none is found.
-FilePath GetGoogleUpdateSetupExe(bool system_install) {
+base::FilePath GetGoogleUpdateSetupExe(bool system_install) {
   const HKEY root_key = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   RegKey update_key;
 
diff --git a/chrome/installer/util/helper.cc b/chrome/installer/util/helper.cc
index 76ff169..52580a4 100644
--- a/chrome/installer/util/helper.cc
+++ b/chrome/installer/util/helper.cc
@@ -16,9 +16,9 @@
 
 namespace {
 
-FilePath GetChromeInstallBasePath(bool system,
-                                  BrowserDistribution* distribution,
-                                  const wchar_t* sub_path) {
+base::FilePath GetChromeInstallBasePath(bool system,
+                                        BrowserDistribution* distribution,
+                                        const wchar_t* sub_path) {
   base::FilePath install_path;
   if (system) {
     PathService::Get(base::DIR_PROGRAM_FILES, &install_path);
@@ -38,7 +38,8 @@ FilePath GetChromeInstallBasePath(bool system,
 
 namespace installer {
 
-FilePath GetChromeInstallPath(bool system_install, BrowserDistribution* dist) {
+base::FilePath GetChromeInstallPath(bool system_install,
+                                    BrowserDistribution* dist) {
   return GetChromeInstallBasePath(system_install, dist, kInstallBinaryDir);
 }
 
diff --git a/chrome/installer/util/installation_state.cc b/chrome/installer/util/installation_state.cc
index c8c8604..43c73ce 100644
--- a/chrome/installer/util/installation_state.cc
+++ b/chrome/installer/util/installation_state.cc
@@ -143,7 +143,7 @@ bool ProductState::Initialize(bool system_install,
   return version_.get() != NULL;
 }
 
-FilePath ProductState::GetSetupPath() const {
+base::FilePath ProductState::GetSetupPath() const {
   return uninstall_command_.GetProgram();
 }
 
diff --git a/chrome/installer/util/installer_state.cc b/chrome/installer/util/installer_state.cc
index b5fde77..66ffb24 100644
--- a/chrome/installer/util/installer_state.cc
+++ b/chrome/installer/util/installer_state.cc
@@ -346,7 +346,7 @@ void InstallerState::set_package_type(PackageType type) {
 
 // Returns the Chrome binaries directory for multi-install or |dist|'s directory
 // otherwise.
-FilePath InstallerState::GetDefaultProductInstallPath(
+base::FilePath InstallerState::GetDefaultProductInstallPath(
     BrowserDistribution* dist) const {
   DCHECK(dist);
   DCHECK(package_type_ != UNKNOWN_PACKAGE_TYPE);
@@ -597,7 +597,8 @@ bool InstallerState::IsChromeFrameRunning(
   return in_use;
 }
 
-FilePath InstallerState::GetInstallerDirectory(const Version& version) const {
+base::FilePath InstallerState::GetInstallerDirectory(
+    const Version& version) const {
   return target_path().Append(ASCIIToWide(version.GetString()))
       .Append(kInstallerDir);
 }
diff --git a/chrome/installer/util/logging_installer.cc b/chrome/installer/util/logging_installer.cc
index 43791de..f11ec13 100644
--- a/chrome/installer/util/logging_installer.cc
+++ b/chrome/installer/util/logging_installer.cc
@@ -113,7 +113,7 @@ void EndInstallerLogging() {
   installer_logging_ = false;
 }
 
-FilePath GetLogFilePath(const installer::MasterPreferences& prefs) {
+base::FilePath GetLogFilePath(const installer::MasterPreferences& prefs) {
   std::string path;
   prefs.GetString(installer::master_preferences::kLogFile, &path);
   if (!path.empty()) {