12 files changed, 38 insertions, 26 deletions
diff --git a/chrome/browser/history/archived_database.cc b/chrome/browser/history/archived_database.cc
index 3eae2d6..b80509e 100644
--- a/chrome/browser/history/archived_database.cc
+++ b/chrome/browser/history/archived_database.cc
@@ -24,7 +24,7 @@ ArchivedDatabase::ArchivedDatabase() {
 ArchivedDatabase::~ArchivedDatabase() {
 }
 
-bool ArchivedDatabase::Init(const FilePath& file_name) {
+bool ArchivedDatabase::Init(const base::FilePath& file_name) {
   // Set the database page size to something a little larger to give us
   // better performance (we're typically seek rather than bandwidth limited).
   // This only has an effect before any tables have been created, otherwise
diff --git a/chrome/browser/history/archived_database.h b/chrome/browser/history/archived_database.h
index b157f66..0fe7184 100644
--- a/chrome/browser/history/archived_database.h
+++ b/chrome/browser/history/archived_database.h
@@ -12,7 +12,9 @@
 #include "sql/init_status.h"
 #include "sql/meta_table.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace history {
 
@@ -30,7 +32,7 @@ class ArchivedDatabase : public URLDatabase,
 
   // Initializes the database connection. This must return true before any other
   // functions on this class are called.
-  bool Init(const FilePath& file_name);
+  bool Init(const base::FilePath& file_name);
 
   // Transactions on the database. We support nested transactions and only
   // commit when the outermost one is committed (sqlite doesn't support true
diff --git a/chrome/browser/history/download_database.h b/chrome/browser/history/download_database.h
index 8cf07ab..929b097 100644
--- a/chrome/browser/history/download_database.h
+++ b/chrome/browser/history/download_database.h
@@ -11,8 +11,6 @@
 #include "base/threading/platform_thread.h"
 #include "sql/meta_table.h"
 
-class FilePath;
-
 namespace sql {
 class Connection;
 }
diff --git a/chrome/browser/history/history_database.h b/chrome/browser/history/history_database.h
index b374260..981c8a5 100644
--- a/chrome/browser/history/history_database.h
+++ b/chrome/browser/history/history_database.h
@@ -23,7 +23,9 @@
 #include "chrome/browser/history/android/android_urls_database.h"
 #endif
 
+namespace base {
 class FilePath;
+}
 
 namespace history {
 
@@ -67,7 +69,7 @@ class HistoryDatabase : public DownloadDatabase,
   // Must call this function to complete initialization. Will return
   // sql::INIT_OK on success. Otherwise, no other function should be called. You
   // may want to call BeginExclusiveMode after this when you are ready.
-  sql::InitStatus Init(const FilePath& history_name,
+  sql::InitStatus Init(const base::FilePath& history_name,
                        sql::ErrorDelegate* error_delegate);
 
   // Call to set the mode on the database to exclusive. The default locking mode
diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h
index bd7307f..c778783 100644
--- a/chrome/browser/history/history_service.h
+++ b/chrome/browser/history/history_service.h
@@ -40,7 +40,6 @@
 #endif
 
 class BookmarkService;
-class FilePath;
 class GURL;
 class HistoryURLProvider;
 class PageUsageData;
@@ -49,6 +48,7 @@ class Profile;
 struct HistoryURLProviderParams;
 
 namespace base {
+class FilePath;
 class Thread;
 }
 
@@ -129,7 +129,7 @@ class HistoryService : public CancelableRequestProvider,
   // not call any other functions. The given directory will be used for storing
   // the history files. The BookmarkService is used when deleting URLs to
   // test if a URL is bookmarked; it may be NULL during testing.
-  bool Init(const FilePath& history_dir, BookmarkService* bookmark_service) {
+  bool Init(const base::FilePath& history_dir, BookmarkService* bookmark_service) {
     return Init(history_dir, bookmark_service, false);
   }
 
@@ -666,7 +666,7 @@ class HistoryService : public CancelableRequestProvider,
 
   // Low-level Init().  Same as the public version, but adds a |no_db| parameter
   // that is only set by unittests which causes the backend to not init its DB.
-  bool Init(const FilePath& history_dir,
+  bool Init(const base::FilePath& history_dir,
             BookmarkService* bookmark_service,
             bool no_db);
 
@@ -1094,7 +1094,7 @@ class HistoryService : public CancelableRequestProvider,
   int current_backend_id_;
 
   // Cached values from Init(), used whenever we need to reload the backend.
-  FilePath history_dir_;
+  base::FilePath history_dir_;
   BookmarkService* bookmark_service_;
   bool no_db_;
 
diff --git a/chrome/browser/history/in_memory_database.h b/chrome/browser/history/in_memory_database.h
index 17cb6f1..b729686 100644
--- a/chrome/browser/history/in_memory_database.h
+++ b/chrome/browser/history/in_memory_database.h
@@ -9,7 +9,9 @@
 #include "chrome/browser/history/url_database.h"
 #include "sql/connection.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace history {
 
@@ -28,7 +30,7 @@ class InMemoryDatabase : public URLDatabase {
   // file. Conceptually, the InMemoryHistoryBackend should do the populating
   // after this object does some common initialization, but that would be
   // much slower.
-  bool InitFromDisk(const FilePath& history_name);
+  bool InitFromDisk(const base::FilePath& history_name);
 
  protected:
   // Implemented for URLDatabase.
diff --git a/chrome/browser/history/in_memory_history_backend.cc b/chrome/browser/history/in_memory_history_backend.cc
index b0dac72..f75d1c9 100644
--- a/chrome/browser/history/in_memory_history_backend.cc
+++ b/chrome/browser/history/in_memory_history_backend.cc
@@ -27,7 +27,7 @@ InMemoryHistoryBackend::InMemoryHistoryBackend()
 
 InMemoryHistoryBackend::~InMemoryHistoryBackend() {}
 
-bool InMemoryHistoryBackend::Init(const FilePath& history_filename,
+bool InMemoryHistoryBackend::Init(const base::FilePath& history_filename,
                                   URLDatabase* db) {
   db_.reset(new InMemoryDatabase);
   return db_->InitFromDisk(history_filename);
diff --git a/chrome/browser/history/in_memory_history_backend.h b/chrome/browser/history/in_memory_history_backend.h
index addfac9..a2d1f72 100644
--- a/chrome/browser/history/in_memory_history_backend.h
+++ b/chrome/browser/history/in_memory_history_backend.h
@@ -21,10 +21,13 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
-class FilePath;
 class GURL;
 class Profile;
 
+namespace base {
+class FilePath;
+}
+
 namespace history {
 
 class InMemoryDatabase;
@@ -42,7 +45,7 @@ class InMemoryHistoryBackend : public content::NotificationObserver {
   // Initializes the backend from the history database pointed to by the
   // full path in |history_filename|. |db| is used for setting up the
   // InMemoryDatabase.
-  bool Init(const FilePath& history_filename, URLDatabase* db);
+  bool Init(const base::FilePath& history_filename, URLDatabase* db);
 
   // Does initialization work when this object is attached to the history
   // system on the main thread. The argument is the profile with which the
diff --git a/chrome/browser/history/thumbnail_database.h b/chrome/browser/history/thumbnail_database.h
index 9ee17c7..4e8f789 100644
--- a/chrome/browser/history/thumbnail_database.h
+++ b/chrome/browser/history/thumbnail_database.h
@@ -15,11 +15,11 @@
 #include "sql/meta_table.h"
 #include "sql/statement.h"
 
-class FilePath;
 struct ThumbnailScore;
 class SkBitmap;
 
 namespace base {
+class FilePath;
 class RefCountedMemory;
 class Time;
 }
@@ -47,7 +47,7 @@ class ThumbnailDatabase {
 
   // Must be called after creation but before any other methods are called.
   // When not INIT_OK, no other functions should be called.
-  sql::InitStatus Init(const FilePath& db_name,
+  sql::InitStatus Init(const base::FilePath& db_name,
                        const HistoryPublisher* history_publisher,
                        URLDatabase* url_database);
 
@@ -56,7 +56,7 @@ class ThumbnailDatabase {
   // |db| is the database to open.
   // |db_name| is a path to the database file.
   static sql::InitStatus OpenDatabase(sql::Connection* db,
-                                      const FilePath& db_name);
+                                      const base::FilePath& db_name);
 
   // Transactions on the database.
   void BeginTransaction();
@@ -308,8 +308,8 @@ class ThumbnailDatabase {
   bool NeedsMigrationToTopSites();
 
   // Renames the database file and drops the Thumbnails table.
-  bool RenameAndDropThumbnails(const FilePath& old_db_file,
-                               const FilePath& new_db_file);
+  bool RenameAndDropThumbnails(const base::FilePath& old_db_file,
+                               const base::FilePath& new_db_file);
 
  private:
   friend class ExpireHistoryBackend;
diff --git a/chrome/browser/history/top_sites.h b/chrome/browser/history/top_sites.h
index e87f25d..7ea4fa6 100644
--- a/chrome/browser/history/top_sites.h
+++ b/chrome/browser/history/top_sites.h
@@ -29,10 +29,10 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/image/image.h"
 
-class FilePath;
 class Profile;
 
 namespace base {
+class FilePath;
 class RefCountedBytes;
 class RefCountedMemory;
 }
@@ -57,7 +57,7 @@ class TopSites
   explicit TopSites(Profile* profile);
 
   // Initializes TopSites.
-  void Init(const FilePath& db_name);
+  void Init(const base::FilePath& db_name);
 
   // Sets the given thumbnail for the given URL. Returns true if the thumbnail
   // was updated. False means either the URL wasn't known to us, or we felt
diff --git a/chrome/browser/history/top_sites_backend.h b/chrome/browser/history/top_sites_backend.h
index 163af2c..5028286 100644
--- a/chrome/browser/history/top_sites_backend.h
+++ b/chrome/browser/history/top_sites_backend.h
@@ -12,7 +12,10 @@
 #include "chrome/browser/history/history_types.h"
 
 class CancelableTaskTracker;
+
+namespace base {
 class FilePath;
+}
 
 namespace history {
 
@@ -31,7 +34,7 @@ class TopSitesBackend : public base::RefCountedThreadSafe<TopSitesBackend> {
 
   TopSitesBackend();
 
-  void Init(const FilePath& path);
+  void Init(const base::FilePath& path);
 
   // Schedules the db to be shutdown.
   void Shutdown();
@@ -64,7 +67,7 @@ class TopSitesBackend : public base::RefCountedThreadSafe<TopSitesBackend> {
   virtual ~TopSitesBackend();
 
   // Invokes Init on the db_.
-  void InitDBOnDBThread(const FilePath& path);
+  void InitDBOnDBThread(const base::FilePath& path);
 
   // Shuts down the db.
   void ShutdownDBOnDBThread();
@@ -83,9 +86,9 @@ class TopSitesBackend : public base::RefCountedThreadSafe<TopSitesBackend> {
                                   const Images& thumbnail);
 
   // Resets the database.
-  void ResetDatabaseOnDBThread(const FilePath& file_path);
+  void ResetDatabaseOnDBThread(const base::FilePath& file_path);
 
-  FilePath db_path_;
+  base::FilePath db_path_;
 
   scoped_ptr<TopSitesDatabase> db_;
 
diff --git a/chrome/browser/history/top_sites_database.h b/chrome/browser/history/top_sites_database.h
index 313c706..42e04ed 100644
--- a/chrome/browser/history/top_sites_database.h
+++ b/chrome/browser/history/top_sites_database.h
@@ -13,7 +13,9 @@
 #include "chrome/browser/history/url_database.h"  // For DBCloseScoper.
 #include "sql/meta_table.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace sql {
 class Connection;
@@ -28,7 +30,7 @@ class TopSitesDatabase {
 
   // Must be called after creation but before any other methods are called.
   // Returns true on success. If false, no other functions should be called.
-  bool Init(const FilePath& db_name);
+  bool Init(const base::FilePath& db_name);
 
   // Returns true if migration of top sites from history may be needed. A value
   // of true means either migration is definitely needed (the top sites file is
@@ -92,7 +94,7 @@ class TopSitesDatabase {
   // Returns the number of URLs (rows) in the database.
   int GetRowCount();
 
-  sql::Connection* CreateDB(const FilePath& db_name);
+  sql::Connection* CreateDB(const base::FilePath& db_name);
 
   // Encodes redirects into a string.
   static std::string GetRedirects(const MostVisitedURL& url);