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

sync/syncable/syncable_unittest.cc

 // Copyright 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 <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 85 matching lines @@
   }
 
   virtual void TearDown() {
   }
  protected:
   MessageLoop message_loop_;
   base::ScopedTempDir temp_dir_;
   NullDirectoryChangeDelegate delegate_;
   FakeEncryptor encryptor_;
   TestUnrecoverableErrorHandler handler_;
-  FilePath db_path_;
+  base::FilePath db_path_;
 };
 
 const char SyncableGeneralTest::kIndexTestName[] = "IndexTest";
 
 TEST_F(SyncableGeneralTest, General) {
   Directory dir(new InMemoryDirectoryBackingStore("SimpleTest"),
                 &handler_,
                 NULL,
                 NULL,
                 NULL);
@@ skipping 1409 matching lines @@
     EXPECT_TRUE(
         null_ord.Equals(null_ordinal_child.Get(SERVER_ORDINAL_IN_PARENT)));
   }
 
 }
 
 // An OnDirectoryBackingStore that can be set to always fail SaveChanges.
 class TestBackingStore : public OnDiskDirectoryBackingStore {
  public:
   TestBackingStore(const std::string& dir_name,
-                   const FilePath& backing_filepath);
+                   const base::FilePath& backing_filepath);
 
   virtual ~TestBackingStore();
 
   virtual bool SaveChanges(const Directory::SaveChangesSnapshot& snapshot)
       OVERRIDE;
 
    void StartFailingSaveChanges() {
      fail_save_changes_ = true;
    }
 
  private:
    bool fail_save_changes_;
 };
 
 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) {
 }
 
 TestBackingStore::~TestBackingStore() { }
 
 bool TestBackingStore::SaveChanges(
     const Directory::SaveChangesSnapshot& snapshot){
   if (fail_save_changes_) {
     return false;
   } else {
     return OnDiskDirectoryBackingStore::SaveChanges(snapshot);
   }
 }
 
 // A directory whose Save() function can be set to always fail.
 class TestDirectory : public Directory {
  public:
   // A factory function used to work around some initialization order issues.
   static TestDirectory* Create(
       Encryptor *encryptor,
       UnrecoverableErrorHandler *handler,
       const std::string& dir_name,
-      const FilePath& backing_filepath);
+      const base::FilePath& backing_filepath);
 
   virtual ~TestDirectory();
 
   void StartFailingSaveChanges() {
     backing_store_->StartFailingSaveChanges();
   }
 
  private:
   TestDirectory(Encryptor* encryptor,
                 UnrecoverableErrorHandler* handler,
                 TestBackingStore* backing_store);
 
   TestBackingStore* backing_store_;
 };
 
 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);
 }
 
 TestDirectory::TestDirectory(Encryptor* encryptor,
                              UnrecoverableErrorHandler* handler,
                              TestBackingStore* backing_store)
     : Directory(backing_store, handler, NULL, NULL, NULL),
       backing_store_(backing_store) {
 }
 
 TestDirectory::~TestDirectory() { }
 
 TEST(OnDiskSyncableDirectory, FailInitialWrite) {
   FakeEncryptor encryptor;
   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;
 
   scoped_ptr<TestDirectory> test_dir(
       TestDirectory::Create(&encryptor, &handler, name, file_path));
 
   test_dir->StartFailingSaveChanges();
   ASSERT_EQ(FAILED_INITIAL_WRITE, test_dir->Open(name, &delegate,
                                                  NullTransactionObserver()));
@@ skipping 34 matching lines @@
     dir_->SaveChanges();
     CreateDirectory();
   }
 
   void StartFailingSaveChanges() {
     test_directory_->StartFailingSaveChanges();
   }
 
   TestDirectory *test_directory_;  // mirrors scoped_ptr<Directory> dir_
   base::ScopedTempDir temp_dir_;
-  FilePath file_path_;
+  base::FilePath file_path_;
 };
 
 TEST_F(OnDiskSyncableDirectoryTest, TestPurgeEntriesWithTypeIn) {
   sync_pb::EntitySpecifics bookmark_specs;
   sync_pb::EntitySpecifics autofill_specs;
   sync_pb::EntitySpecifics preference_specs;
   AddDefaultFieldValue(BOOKMARKS, &bookmark_specs);
   AddDefaultFieldValue(PREFERENCES, &preference_specs);
   AddDefaultFieldValue(AUTOFILL, &autofill_specs);
 
@@ skipping 388 matching lines @@
   }
  protected:
   MessageLoop message_loop_;
   base::ScopedTempDir temp_dir_;
   FakeEncryptor encryptor_;
   TestUnrecoverableErrorHandler handler_;
   NullDirectoryChangeDelegate delegate_;
 };
 
 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),
                           &handler_,
                           NULL,
                           NULL,
                           NULL);
   DirOpenResult result =
       dir.Open("ScopeTest", &delegate_, NullTransactionObserver());
   ASSERT_EQ(result, OPENED);
@@ skipping 169 matching lines @@
   EXPECT_TRUE(CreateWithDefaultTag(factory_.NewServerId(), true));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), true));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), false));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), false));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), true));
 }
 
 }  // namespace
 }  // namespace syncable
 }  // namespace syncer