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

1 files changed, 6 insertions, 6 deletions

diff --git a/base/base_paths_mac.mm b/base/base_paths_mac.mm
index 630f742..39a5814 100644
--- a/base/base_paths_mac.mm
+++ b/base/base_paths_mac.mm
@@ -21,7 +21,7 @@
 
 namespace {
 
-void GetNSExecutablePath(FilePath* path) {
+void GetNSExecutablePath(base::FilePath* path) {
   DCHECK(path);
   // Executable path can have relative references ("..") depending on
   // how the app was launched.
@@ -32,19 +32,19 @@ void GetNSExecutablePath(FilePath* path) {
   int rv = _NSGetExecutablePath(WriteInto(&executable_path, executable_length),
                                 &executable_length);
   DCHECK_EQ(rv, 0);
-  *path = FilePath(executable_path);
+  *path = base::FilePath(executable_path);
 }
 
 // Returns true if the module for |address| is found. |path| will contain
 // the path to the module. Note that |path| may not be absolute.
-bool GetModulePathForAddress(FilePath* path,
+bool GetModulePathForAddress(base::FilePath* path,
                              const void* address) WARN_UNUSED_RESULT;
 
-bool GetModulePathForAddress(FilePath* path, const void* address) {
+bool GetModulePathForAddress(base::FilePath* path, const void* address) {
   Dl_info info;
   if (dladdr(address, &info) == 0)
     return false;
-  *path = FilePath(info.dli_fname);
+  *path = base::FilePath(info.dli_fname);
   return true;
 }
 
@@ -52,7 +52,7 @@ bool GetModulePathForAddress(FilePath* path, const void* address) {
 
 namespace base {
 
-bool PathProviderMac(int key, FilePath* result) {
+bool PathProviderMac(int key, base::FilePath* result) {
   switch (key) {
     case base::FILE_EXE:
       GetNSExecutablePath(result);