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

6 files changed, 16 insertions, 16 deletions

diff --git a/sync/syncable/directory.cc b/sync/syncable/directory.cc
index f27d4ca..a9e0f65 100644
--- a/sync/syncable/directory.cc
+++ b/sync/syncable/directory.cc
@@ -68,7 +68,7 @@ bool ParentIdAndHandleIndexer::ShouldInclude(const EntryKernel* a) {
 }
 
 // static
-const FilePath::CharType Directory::kSyncDatabaseFilename[] =
+const base::FilePath::CharType Directory::kSyncDatabaseFilename[] =
     FILE_PATH_LITERAL("SyncData.sqlite3");
 
 void Directory::InitKernelForTest(
diff --git a/sync/syncable/directory.h b/sync/syncable/directory.h
index b54b0cc..51ceaf8 100644
--- a/sync/syncable/directory.h
+++ b/sync/syncable/directory.h
@@ -141,7 +141,7 @@ class SYNC_EXPORT Directory {
                            TakeSnapshotGetsMetahandlesToPurge);
 
  public:
-  static const FilePath::CharType kSyncDatabaseFilename[];
+  static const base::FilePath::CharType kSyncDatabaseFilename[];
 
   // Various data that the Directory::Kernel we are backing (persisting data
   // for) needs saved across runs of the application.
diff --git a/sync/syncable/directory_backing_store_unittest.cc b/sync/syncable/directory_backing_store_unittest.cc
index 9691197..3fa9edd 100644
--- a/sync/syncable/directory_backing_store_unittest.cc
+++ b/sync/syncable/directory_backing_store_unittest.cc
@@ -41,7 +41,7 @@ class MigrationTest : public testing::TestWithParam<int> {
     return "nick@chromium.org";
   }
 
-  FilePath GetDatabasePath() {
+  base::FilePath GetDatabasePath() {
     return temp_dir_.path().Append(Directory::kSyncDatabaseFilename);
   }
 
@@ -3188,7 +3188,7 @@ namespace {
 class OnDiskDirectoryBackingStoreForTest : public OnDiskDirectoryBackingStore {
  public:
   OnDiskDirectoryBackingStoreForTest(const std::string& dir_name,
-                                     const FilePath& backing_filepath);
+                                     const base::FilePath& backing_filepath);
   virtual ~OnDiskDirectoryBackingStoreForTest();
   bool DidFailFirstOpenAttempt();
 
@@ -3201,7 +3201,7 @@ class OnDiskDirectoryBackingStoreForTest : public OnDiskDirectoryBackingStore {
 
 OnDiskDirectoryBackingStoreForTest::OnDiskDirectoryBackingStoreForTest(
     const std::string& dir_name,
-    const FilePath& backing_filepath) :
+    const base::FilePath& backing_filepath) :
   OnDiskDirectoryBackingStore(dir_name, backing_filepath),
   first_open_failed_(false) { }
 
diff --git a/sync/syncable/on_disk_directory_backing_store.cc b/sync/syncable/on_disk_directory_backing_store.cc
index 7264e0c..abe20d1 100644
--- a/sync/syncable/on_disk_directory_backing_store.cc
+++ b/sync/syncable/on_disk_directory_backing_store.cc
@@ -24,7 +24,7 @@ enum HistogramResultEnum {
 }  // namespace
 
 OnDiskDirectoryBackingStore::OnDiskDirectoryBackingStore(
-    const std::string& dir_name, const FilePath& backing_filepath)
+    const std::string& dir_name, const base::FilePath& backing_filepath)
     : DirectoryBackingStore(dir_name),
       allow_failure_for_test_(false),
       backing_filepath_(backing_filepath) {
diff --git a/sync/syncable/on_disk_directory_backing_store.h b/sync/syncable/on_disk_directory_backing_store.h
index 06e14b8..bcb62c2 100644
--- a/sync/syncable/on_disk_directory_backing_store.h
+++ b/sync/syncable/on_disk_directory_backing_store.h
@@ -18,7 +18,7 @@ class SYNC_EXPORT_PRIVATE OnDiskDirectoryBackingStore
     : public DirectoryBackingStore {
  public:
   OnDiskDirectoryBackingStore(const std::string& dir_name,
-                              const FilePath& backing_filepath);
+                              const base::FilePath& backing_filepath);
   virtual ~OnDiskDirectoryBackingStore();
   virtual DirOpenResult Load(
       MetahandlesIndex* entry_bucket,
@@ -40,7 +40,7 @@ class SYNC_EXPORT_PRIVATE OnDiskDirectoryBackingStore
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MinorCorruption);
 
   bool allow_failure_for_test_;
-  FilePath backing_filepath_;
+  base::FilePath backing_filepath_;
 
   DISALLOW_COPY_AND_ASSIGN(OnDiskDirectoryBackingStore);
 };
diff --git a/sync/syncable/syncable_unittest.cc b/sync/syncable/syncable_unittest.cc
index 8031fc0e1..b162934 100644
--- a/sync/syncable/syncable_unittest.cc
+++ b/sync/syncable/syncable_unittest.cc
@@ -103,7 +103,7 @@ class SyncableGeneralTest : public testing::Test {
   NullDirectoryChangeDelegate delegate_;
   FakeEncryptor encryptor_;
   TestUnrecoverableErrorHandler handler_;
-  FilePath db_path_;
+  base::FilePath db_path_;
 };
 
 const char SyncableGeneralTest::kIndexTestName[] = "IndexTest";
@@ -1533,7 +1533,7 @@ TEST_F(SyncableDirectoryTest, OrdinalWithNullSurvivesSaveAndReload) {
 class TestBackingStore : public OnDiskDirectoryBackingStore {
  public:
   TestBackingStore(const std::string& dir_name,
-                   const FilePath& backing_filepath);
+                   const base::FilePath& backing_filepath);
 
   virtual ~TestBackingStore();
 
@@ -1549,7 +1549,7 @@ class TestBackingStore : public OnDiskDirectoryBackingStore {
 };
 
 TestBackingStore::TestBackingStore(const std::string& dir_name,
-                                   const FilePath& backing_filepath)
+                                   const base::FilePath& backing_filepath)
   : OnDiskDirectoryBackingStore(dir_name, backing_filepath),
     fail_save_changes_(false) {
 }
@@ -1573,7 +1573,7 @@ class TestDirectory : public Directory {
       Encryptor *encryptor,
       UnrecoverableErrorHandler *handler,
       const std::string& dir_name,
-      const FilePath& backing_filepath);
+      const base::FilePath& backing_filepath);
 
   virtual ~TestDirectory();
 
@@ -1593,7 +1593,7 @@ TestDirectory* TestDirectory::Create(
     Encryptor *encryptor,
     UnrecoverableErrorHandler *handler,
     const std::string& dir_name,
-    const FilePath& backing_filepath) {
+    const base::FilePath& backing_filepath) {
   TestBackingStore* backing_store =
       new TestBackingStore(dir_name, backing_filepath);
   return new TestDirectory(encryptor, handler, backing_store);
@@ -1613,7 +1613,7 @@ TEST(OnDiskSyncableDirectory, FailInitialWrite) {
   TestUnrecoverableErrorHandler handler;
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  FilePath file_path = temp_dir.path().Append(
+  base::FilePath file_path = temp_dir.path().Append(
       FILE_PATH_LITERAL("Test.sqlite3"));
   std::string name = "user@x.com";
   NullDirectoryChangeDelegate delegate;
@@ -1668,7 +1668,7 @@ class OnDiskSyncableDirectoryTest : public SyncableDirectoryTest {
 
   TestDirectory *test_directory_;  // mirrors scoped_ptr<Directory> dir_
   base::ScopedTempDir temp_dir_;
-  FilePath file_path_;
+  base::FilePath file_path_;
 };
 
 TEST_F(OnDiskSyncableDirectoryTest, TestPurgeEntriesWithTypeIn) {
@@ -2077,7 +2077,7 @@ class SyncableDirectoryManagement : public testing::Test {
 };
 
 TEST_F(SyncableDirectoryManagement, TestFileRelease) {
-  FilePath path = temp_dir_.path().Append(
+  base::FilePath path = temp_dir_.path().Append(
       Directory::kSyncDatabaseFilename);
 
   syncable::Directory dir(new OnDiskDirectoryBackingStore("ScopeTest", path),