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

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

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

5 files changed, 11 insertions, 10 deletions

diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.cc b/rlz/chromeos/lib/rlz_value_store_chromeos.cc
index bb9c431..31577cc 100644
--- a/rlz/chromeos/lib/rlz_value_store_chromeos.cc
+++ b/rlz/chromeos/lib/rlz_value_store_chromeos.cc
@@ -34,10 +34,11 @@ const char kStatefulEventKey[] = "stateful_events";
 const char kNoSupplementaryBrand[] = "_";
 
 // RLZ store filename.
-const FilePath::CharType kRLZDataFileName[] = FILE_PATH_LITERAL("RLZ Data");
+const base::FilePath::CharType kRLZDataFileName[] =
+    FILE_PATH_LITERAL("RLZ Data");
 
 // RLZ store lock filename
-const FilePath::CharType kRLZLockFileName[] =
+const base::FilePath::CharType kRLZLockFileName[] =
     FILE_PATH_LITERAL("RLZ Data.lock");
 
 // RLZ store path for testing.
@@ -75,7 +76,7 @@ std::string GetKeyName(std::string key, Product product) {
 
 }  // namespace
 
-RlzValueStoreChromeOS::RlzValueStoreChromeOS(const FilePath& store_path)
+RlzValueStoreChromeOS::RlzValueStoreChromeOS(const base::FilePath& store_path)
     : rlz_store_(new base::DictionaryValue),
       store_path_(store_path),
       read_only_(true) {
@@ -325,7 +326,7 @@ RlzValueStore* ScopedRlzValueStoreLock::GetStore() {
 
 namespace testing {
 
-void SetRlzStoreDirectory(const FilePath& directory) {
+void SetRlzStoreDirectory(const base::FilePath& directory) {
   g_testing_rlz_store_path_ = directory;
 }
 
diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.h b/rlz/chromeos/lib/rlz_value_store_chromeos.h
index 4760418..e150c3c 100644
--- a/rlz/chromeos/lib/rlz_value_store_chromeos.h
+++ b/rlz/chromeos/lib/rlz_value_store_chromeos.h
@@ -27,7 +27,7 @@ class RlzValueStoreChromeOS : public RlzValueStore,
   // static void SetFileTaskRunner(base::SequencedTaskRunner* file_task_runner);
 
   // Creates new instance and synchronously reads data from file.
-  RlzValueStoreChromeOS(const FilePath& store_path);
+  RlzValueStoreChromeOS(const base::FilePath& store_path);
   virtual ~RlzValueStoreChromeOS();
 
   // RlzValueStore overrides:
@@ -74,7 +74,7 @@ class RlzValueStoreChromeOS : public RlzValueStore,
   // In-memory store with RLZ data.
   scoped_ptr<base::DictionaryValue> rlz_store_;
 
-  FilePath store_path_;
+  base::FilePath store_path_;
 
   bool read_only_;
 
diff --git a/rlz/lib/recursive_cross_process_lock_posix.cc b/rlz/lib/recursive_cross_process_lock_posix.cc
index 561c3cd..887216b 100644
--- a/rlz/lib/recursive_cross_process_lock_posix.cc
+++ b/rlz/lib/recursive_cross_process_lock_posix.cc
@@ -17,7 +17,7 @@
 namespace rlz_lib {
 
 bool RecursiveCrossProcessLock::TryGetCrossProcessLock(
-    const FilePath& lock_filename) {
+    const base::FilePath& lock_filename) {
   bool just_got_lock = false;
 
   // Emulate a recursive mutex with a non-recursive one.
diff --git a/rlz/mac/lib/rlz_value_store_mac.mm b/rlz/mac/lib/rlz_value_store_mac.mm
index 6b8e6f4..9601d4c 100644
--- a/rlz/mac/lib/rlz_value_store_mac.mm
+++ b/rlz/mac/lib/rlz_value_store_mac.mm
@@ -275,7 +275,7 @@ NSString* RlzLockFilename() {
 
 ScopedRlzValueStoreLock::ScopedRlzValueStoreLock() {
   bool got_distributed_lock = g_recursive_lock.TryGetCrossProcessLock(
-      FilePath([RlzLockFilename() fileSystemRepresentation]));
+      base::FilePath([RlzLockFilename() fileSystemRepresentation]));
   // At this point, we hold the in-process lock, no matter the value of
   // |got_distributed_lock|.
 
@@ -349,7 +349,7 @@ RlzValueStore* ScopedRlzValueStoreLock::GetStore() {
 
 namespace testing {
 
-void SetRlzStoreDirectory(const FilePath& directory) {
+void SetRlzStoreDirectory(const base::FilePath& directory) {
   base::mac::ScopedNSAutoreleasePool pool;
 
   [g_test_folder release];
diff --git a/rlz/test/rlz_test_helpers.cc b/rlz/test/rlz_test_helpers.cc
index 32719e0..398d0da 100644
--- a/rlz/test/rlz_test_helpers.cc
+++ b/rlz/test/rlz_test_helpers.cc
@@ -75,7 +75,7 @@ void RlzLibTestNoMachineState::TearDown() {
 #if defined(OS_WIN)
   UndoOverrideRegistryHives();
 #elif defined(OS_POSIX)
-  rlz_lib::testing::SetRlzStoreDirectory(FilePath());
+  rlz_lib::testing::SetRlzStoreDirectory(base::FilePath());
 #endif  // defined(OS_WIN)
 }