Changes favicon database to support storing bitmaps of different sizes for the same icon_url

chrome/browser/history/thumbnail_database.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_HISTORY_THUMBNAIL_DATABASE_H_
 #define CHROME_BROWSER_HISTORY_THUMBNAIL_DATABASE_H_
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
@@ skipping 239 matching lines @@
   // Renames the database file and drops the Thumbnails table.
   bool RenameAndDropThumbnails(const FilePath& old_db_file,
                                const FilePath& new_db_file);
 
  private:
   friend class ExpireHistoryBackend;
   FRIEND_TEST_ALL_PREFIXES(ThumbnailDatabaseTest,
                            GetFaviconAfterMigrationToTopSites);
   FRIEND_TEST_ALL_PREFIXES(ThumbnailDatabaseTest, UpgradeToVersion4);
   FRIEND_TEST_ALL_PREFIXES(ThumbnailDatabaseTest, UpgradeToVersion5);
+  FRIEND_TEST_ALL_PREFIXES(ThumbnailDatabaseTest, UpgradeToVersion6);
   FRIEND_TEST_ALL_PREFIXES(HistoryBackendTest, MigrationIconMapping);
 
   // Creates the thumbnail table, returning true if the table already exists
   // or was successfully created.
   bool InitThumbnailTable();
 
   // Creates the favicon table, returning true if the table already exists,
   // or was successfully created. |is_temporary| will be false when generating
   // the "regular" favicons table. The expirer sets this to true to generate the
   // temporary table, which will have a different name but the same schema.
   // |db| is the connection to use for initializing the table.
   // A different connection is used in RenameAndDropThumbnails, when we
   // need to copy the favicons between two database files.
   bool InitFaviconsTable(sql::Connection* db, bool is_temporary);
 
   // Helper function to handle cleanup on upgrade failures.
   sql::InitStatus CantUpgradeToVersion(int cur_version);
 
   // Adds support for the new metadata on web page thumbnails.
   bool UpgradeToVersion3();
 
   // Adds support for the icon_type in favicon table.
   bool UpgradeToVersion4();
 
   // Adds support for sizes in favicon table.
   bool UpgradeToVersion5();
 
+  // Adds support for size in favicons table and removes sizes column.
+  bool UpgradeToVersion6();
+
   // Migrates the icon mapping data from URL database to Thumbnail database.
   // Return whether the migration succeeds.
   bool MigrateIconMappingData(URLDatabase* url_db);
 
   // Creates the index over the favicon table. This will be called during
   // initialization after the table is created. This is a separate function
   // because it is used by SwapFaviconTables to create an index over the
   // newly-renamed favicons table (formerly the temporary table with no index).
   bool InitFaviconsIndex();
 
@@ skipping 28 matching lines @@
   const HistoryPublisher* history_publisher_;
 
   // True if migration to TopSites has been done and the thumbnails
   // table should not be used.
   bool use_top_sites_;
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_THUMBNAIL_DATABASE_H_