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

rlz/chromeos/lib/rlz_value_store_chromeos.cc

 // 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/chromeos/lib/rlz_value_store_chromeos.h"
 
 #include "base/file_util.h"
 #include "base/files/important_file_writer.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 16 matching lines @@
 // Key names.
 const char kPingTimeKey[] = "ping_time";
 const char kAccessPointKey[] = "access_points";
 const char kProductEventKey[] = "product_events";
 const char kStatefulEventKey[] = "stateful_events";
 
 // Brand name used when there is no supplementary brand name.
 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.
 FilePath g_testing_rlz_store_path_;
 
 // Returns file path of the RLZ storage.
 FilePath GetRlzStorePath() {
   return g_testing_rlz_store_path_.empty() ?
       file_util::GetHomeDir().Append(kRLZDataFileName) :
       g_testing_rlz_store_path_.Append(kRLZDataFileName);
@@ skipping 17 matching lines @@
 // Returns the dictionary key for storing product-related prefs.
 std::string GetKeyName(std::string key, Product product) {
   std::string brand = SupplementaryBranding::GetBrand();
   if (brand.empty())
     brand = kNoSupplementaryBrand;
   return key + "." + GetProductName(product) + "." + brand;
 }
 
 }  // 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) {
   ReadStore();
 }
 
 RlzValueStoreChromeOS::~RlzValueStoreChromeOS() {
   WriteStore();
 }
 
@@ skipping 229 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) {
   g_testing_rlz_store_path_ = directory;
 }
 
 std::string RlzStoreFilenameStr() {
   return GetRlzStorePath().value();
 }
 
 }  // namespace testing
 
 }  // namespace rlz_lib