Rename the Thumbnails database file to Favicons.

The database will no longer store the thumbnails - TopSites is storing it's own thumbnails.

BUG=None
TEST=ThumbnailDatabaseTest

Review URL: http://codereview.chromium.org/2842034

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

1 files changed, 13 insertions, 2 deletions

diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc
index 742f458..3eb7c76 100644
--- a/chrome/browser/history/history_backend.cc
+++ b/chrome/browser/history/history_backend.cc
@@ -273,6 +273,10 @@ FilePath HistoryBackend::GetThumbnailFileName() const {
   return history_dir_.Append(chrome::kThumbnailsFilename);
 }
 
+FilePath HistoryBackend::GetFaviconsFileName() const {
+  return history_dir_.Append(chrome::kFaviconsFilename);
+}
+
 FilePath HistoryBackend::GetArchivedFileName() const {
   return history_dir_.Append(chrome::kArchivedHistoryFilename);
 }
@@ -578,6 +582,12 @@ void HistoryBackend::InitImpl() {
 
   // Thumbnail database.
   thumbnail_db_.reset(new ThumbnailDatabase());
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTopSites)) {
+    if (!file_util::PathExists(thumbnail_name)) {
+      // No convertion needed - use new filename right away.
+      thumbnail_name = GetFaviconsFileName();
+    }
+  }
   if (thumbnail_db_->Init(thumbnail_name,
                           history_publisher_.get()) != sql::INIT_OK) {
     // Unlike the main database, we don't error out when the database is too
@@ -2146,8 +2156,9 @@ BookmarkService* HistoryBackend::GetBookmarkService() {
   return bookmark_service_;
 }
 
-void HistoryBackend::DeleteThumbnailsDatabase() {
-  thumbnail_db_->DropThumbnailsTable();
+void HistoryBackend::MigrateThumbnailsDatabase() {
+  thumbnail_db_->RenameAndDropThumbnails(GetThumbnailFileName(),
+                                         GetFaviconsFileName());
 }
 
 }  // namespace history