Replace FilePath with base::FilePath in some more top level directories.

ui/base/resource/resource_bundle_mac.mm

 // 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 "ui/base/resource/resource_bundle.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 22 matching lines @@
                                                            ofType:@"pak"
                                                       inDirectory:@""
                                                   forLocalization:mac_locale];
   } else {
     resource_path = [base::mac::FrameworkBundle() pathForResource:name
                                                            ofType:@"pak"];
   }
 
   if (!resource_path) {
     // Return just the name of the pack file.
-    return FilePath(base::SysNSStringToUTF8(name) + ".pak");
+    return base::FilePath(base::SysNSStringToUTF8(name) + ".pak");
   }
 
-  return FilePath([resource_path fileSystemRepresentation]);
+  return base::FilePath([resource_path fileSystemRepresentation]);
 }
 
 }  // namespace
 
 void ResourceBundle::LoadCommonResources() {
   AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil),
                       SCALE_FACTOR_NONE);
   AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent",
                         nil), SCALE_FACTOR_100P);
   AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_100_percent",
@@ skipping 14 matching lines @@
   NSString* mac_locale = base::SysUTF8ToNSString(app_locale);
 
   // Mac OS X uses "_" instead of "-", so swap to get a Mac-style value.
   mac_locale = [mac_locale stringByReplacingOccurrencesOfString:@"-"
                                                      withString:@"_"];
 
   // On disk, the "en_US" resources are just "en" (http://crbug.com/25578).
   if ([mac_locale isEqual:@"en_US"])
     mac_locale = @"en";
 
-  FilePath locale_file_path = GetResourcesPakFilePath(@"locale", mac_locale);
+  base::FilePath locale_file_path =
+      GetResourcesPakFilePath(@"locale", mac_locale);
 
   if (delegate_) {
     locale_file_path =
         delegate_->GetPathForLocalePack(locale_file_path, app_locale);
   }
 
   // Don't try to load empty values or values that are not absolute paths.
   if (locale_file_path.empty() || !locale_file_path.IsAbsolute())
-    return FilePath();
+    return base::FilePath();
 
   if (test_file_exists && !file_util::PathExists(locale_file_path))
-    return FilePath();
+    return base::FilePath();
 
   return locale_file_path;
 }
 
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
   // Flipped images are not used on Mac.
   DCHECK_EQ(rtl, RTL_DISABLED);
 
   // Check to see if the image is already in the cache.
   {
@@ skipping 46 matching lines @@
 
   // Another thread raced the load and has already cached the image.
   if (images_.count(resource_id))
     return images_[resource_id];
 
   images_[resource_id] = image;
   return images_[resource_id];
 }
 
 }  // namespace ui