More FilePath -> base::FilePath replacement.

Review URL: https://codereview.chromium.org/12225112

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181655 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 12 insertions, 12 deletions

diff --git a/components/visitedlink/browser/visitedlink_master.cc b/components/visitedlink/browser/visitedlink_master.cc
index e09fafa..6db2026 100644
--- a/components/visitedlink/browser/visitedlink_master.cc
+++ b/components/visitedlink/browser/visitedlink_master.cc
@@ -68,7 +68,7 @@ void GenerateSalt(uint8 salt[LINK_SALT_LENGTH]) {
 }
 
 // Opens file on a background thread to not block UI thread.
-void AsyncOpen(FILE** file, const FilePath& filename) {
+void AsyncOpen(FILE** file, const base::FilePath& filename) {
   *file = OpenFile(filename, "wb+");
   DLOG_IF(ERROR, !(*file)) << "Failed to open file " << filename.value();
 }
@@ -194,7 +194,7 @@ VisitedLinkMaster::VisitedLinkMaster(Listener* listener,
                                      VisitedLinkDelegate* delegate,
                                      bool persist_to_disk,
                                      bool suppress_rebuild,
-                                     const FilePath& filename,
+                                     const base::FilePath& filename,
                                      int32 default_table_size)
     : browser_context_(NULL),
       delegate_(delegate),
@@ -516,7 +516,7 @@ void VisitedLinkMaster::WriteFullTable() {
 
   if (!file_) {
     file_ = static_cast<FILE**>(calloc(1, sizeof(*file_)));
-    FilePath filename;
+    base::FilePath filename;
     GetDatabaseFileName(&filename);
     PostIOTask(FROM_HERE, base::Bind(&AsyncOpen, file_, filename));
   }
@@ -542,7 +542,7 @@ bool VisitedLinkMaster::InitFromFile() {
   DCHECK(file_ == NULL);
   DCHECK(persist_to_disk_);
 
-  FilePath filename;
+  base::FilePath filename;
   GetDatabaseFileName(&filename);
   ScopedFILE file_closer(OpenFile(filename, "rb+"));
   if (!file_closer.get())
@@ -653,7 +653,7 @@ bool VisitedLinkMaster::ReadFileHeader(FILE* file,
   return true;
 }
 
-bool VisitedLinkMaster::GetDatabaseFileName(FilePath* filename) {
+bool VisitedLinkMaster::GetDatabaseFileName(base::FilePath* filename) {
   if (!database_name_override_.empty()) {
     // use this filename, the directory must exist
     *filename = database_name_override_;
@@ -663,7 +663,7 @@ bool VisitedLinkMaster::GetDatabaseFileName(FilePath* filename) {
   if (!browser_context_ || browser_context_->GetPath().empty())
     return false;
 
-  FilePath profile_dir = browser_context_->GetPath();
+  base::FilePath profile_dir = browser_context_->GetPath();
   *filename = profile_dir.Append(FILE_PATH_LITERAL("Visited Links"));
   return true;
 }
diff --git a/components/visitedlink/browser/visitedlink_master.h b/components/visitedlink/browser/visitedlink_master.h
index 072bbfe..aea4ccb 100644
--- a/components/visitedlink/browser/visitedlink_master.h
+++ b/components/visitedlink/browser/visitedlink_master.h
@@ -83,7 +83,7 @@ class VisitedLinkMaster : public VisitedLinkCommon {
                     VisitedLinkDelegate* delegate,
                     bool persist_to_disk,
                     bool suppress_rebuild,
-                    const FilePath& filename,
+                    const base::FilePath& filename,
                     int32 default_table_size);
   virtual ~VisitedLinkMaster();
 
@@ -222,7 +222,7 @@ class VisitedLinkMaster : public VisitedLinkCommon {
                       uint8 salt[LINK_SALT_LENGTH]);
 
   // Fills *filename with the name of the link database filename
-  bool GetDatabaseFileName(FilePath* filename);
+  bool GetDatabaseFileName(base::FilePath* filename);
 
   // Wrapper around Window's WriteFile using asynchronous I/O. This will proxy
   // the write to a background thread.
@@ -409,7 +409,7 @@ class VisitedLinkMaster : public VisitedLinkCommon {
   // in release builds that give "regular" behavior.
 
   // Overridden database file name for testing
-  FilePath database_name_override_;
+  base::FilePath database_name_override_;
 
   // When nonzero, overrides the table size for new databases for testing
   int32 table_size_override_;
diff --git a/components/visitedlink/test/visitedlink_perftest.cc b/components/visitedlink/test/visitedlink_perftest.cc
index b2ab296..a059eb7 100644
--- a/components/visitedlink/test/visitedlink_perftest.cc
+++ b/components/visitedlink/test/visitedlink_perftest.cc
@@ -66,7 +66,7 @@ void FillTable(VisitedLinkMaster& master, const char* prefix,
 
 class VisitedLink : public testing::Test {
  protected:
-  FilePath db_path_;
+  base::FilePath db_path_;
   virtual void SetUp() {
     ASSERT_TRUE(file_util::CreateTemporaryFile(&db_path_));
   }
diff --git a/components/visitedlink/test/visitedlink_unittest.cc b/components/visitedlink/test/visitedlink_unittest.cc
index 08c433f..ff54743 100644
--- a/components/visitedlink/test/visitedlink_unittest.cc
+++ b/components/visitedlink/test/visitedlink_unittest.cc
@@ -227,8 +227,8 @@ class VisitedLinkTest : public testing::Test {
   content::TestBrowserThread file_thread_;
 
   // Filenames for the services;
-  FilePath history_dir_;
-  FilePath visited_file_;
+  base::FilePath history_dir_;
+  base::FilePath visited_file_;
 
   scoped_ptr<VisitedLinkMaster> master_;
   TestVisitedLinkDelegate delegate_;