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

sync/syncable/directory_backing_store_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 "testing/gtest/include/gtest/gtest.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 23 matching lines @@
  public:
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
 
  protected:
   std::string GetUsername() {
     return "nick@chromium.org";
   }
 
-  FilePath GetDatabasePath() {
+  base::FilePath GetDatabasePath() {
     return temp_dir_.path().Append(Directory::kSyncDatabaseFilename);
   }
 
   static bool LoadAndIgnoreReturnedData(DirectoryBackingStore *dbs) {
     MetahandlesIndex metas;
     JournalIndex  delete_journals;;
     STLElementDeleter<MetahandlesIndex> index_deleter(&metas);
     Directory::KernelLoadInfo kernel_load_info;
     return dbs->Load(&metas, &delete_journals, &kernel_load_info) == OPENED;
   }
@@ skipping 3126 matching lines @@
         TestDirectoryBackingStore::ModelIdToModelTypeEnum(model_id.data(),
                                                           model_id.size()));
   }
 }
 
 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();
 
  protected:
   virtual void ReportFirstTryOpenFailure() OVERRIDE;
 
  private:
   bool first_open_failed_;
 };
 
 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) { }
 
 OnDiskDirectoryBackingStoreForTest::~OnDiskDirectoryBackingStoreForTest() { }
 
 void OnDiskDirectoryBackingStoreForTest::ReportFirstTryOpenFailure() {
   // Do nothing, just like we would in release-mode.  In debug mode, we DCHECK.
   first_open_failed_ = true;
 }
 
@@ skipping 88 matching lines @@
   const std::string& guid2 = TestDirectoryBackingStore::GenerateCacheGUID();
   EXPECT_EQ(24U, guid1.size());
   EXPECT_EQ(24U, guid2.size());
   // In theory this test can fail, but it won't before the universe
   // dies of heat death.
   EXPECT_NE(guid1, guid2);
 }
 
 }  // namespace syncable
 }  // namespace syncer