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

rlz/mac/lib/rlz_value_store_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 "rlz/mac/lib/rlz_value_store_mac.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
@@ skipping 257 matching lines @@
 // path if it doesn't exist.
 NSString* RlzLockFilename() {
   NSString* const kRlzLockfile = @"flockfile";
   return [CreateRlzDirectory() stringByAppendingPathComponent:kRlzLockfile];
 }
 
 }  // namespace
 
 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|.
 
   ++g_lock_depth;
 
   if (!got_distributed_lock) {
     // Give up. |store_| isn't set, which signals to callers that acquiring
     // the lock failed. |g_recursive_lock| will be released by the
     // destructor.
     CHECK(!g_store_object);
@@ skipping 53 matching lines @@
 
   g_recursive_lock.ReleaseLock();
 }
 
 RlzValueStore* ScopedRlzValueStoreLock::GetStore() {
   return store_.get();
 }
 
 namespace testing {
 
-void SetRlzStoreDirectory(const FilePath& directory) {
+void SetRlzStoreDirectory(const base::FilePath& directory) {
   base::mac::ScopedNSAutoreleasePool pool;
 
   [g_test_folder release];
   if (directory.empty()) {
     g_test_folder = nil;
   } else {
     // Not Unsafe on OS X.
     g_test_folder =
       [[NSString alloc] initWithUTF8String:directory.AsUTF8Unsafe().c_str()];
   }
 }
 
 std::string RlzStoreFilenameStr() {
   @autoreleasepool {
     return std::string([RlzPlistFilename() fileSystemRepresentation]);
   }
 }
 
 }  // namespace testing
 
 }  // namespace rlz_lib