Cleanup history favicon code

This removes the currently unused IconURLSizesMap.
It also uses the 'expired' parameter in the 'favicon_bitmaps' table instead of the 'sizes' attribute in the 'favicons' table.

Given that we are unlikely going to move to storing unresized bitmaps to the database due to perf problems when resizing the favicon each time it is requested, using the IconURLSizesMap is probably not the right solution in the future anyways. This CL should make the code in HistoryBackend less scary.

BUG=None
Test=No functionality change
     HistoryBackendTest.*

Review URL: https://chromiumcodereview.appspot.com/11746010

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

1 files changed, 3 insertions, 27 deletions

diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc
index fe034eb..e383100 100644
--- a/chrome/browser/history/android/android_provider_backend_unittest.cc
+++ b/chrome/browser/history/android/android_provider_backend_unittest.cc
@@ -255,15 +255,7 @@ TEST_F(AndroidProviderBackendTest, UpdateTables) {
   std::vector<history::FaviconBitmapData> favicon_bitmap_data;
   favicon_bitmap_data.push_back(bitmap_data_element);
 
-  FaviconSizes favicon_sizes;
-  favicon_sizes.push_back(gfx::Size());
-  IconURLSizesMap icon_url_sizes;
-  icon_url_sizes[GURL()] = favicon_sizes;
-
-  history_backend->SetFavicons(url2,
-                               FAVICON,
-                               favicon_bitmap_data,
-                               icon_url_sizes);
+  history_backend->SetFavicons(url2, FAVICON, favicon_bitmap_data);
   history_backend->Closing();
   }
 
@@ -413,15 +405,7 @@ TEST_F(AndroidProviderBackendTest, QueryHistoryAndBookmarks) {
   std::vector<history::FaviconBitmapData> favicon_bitmap_data;
   favicon_bitmap_data.push_back(bitmap_data_element);
 
-  FaviconSizes favicon_sizes;
-  favicon_sizes.push_back(gfx::Size());
-  IconURLSizesMap icon_url_sizes;
-  icon_url_sizes[GURL()] = favicon_sizes;
-
-  history_backend->SetFavicons(url2,
-                               FAVICON,
-                               favicon_bitmap_data,
-                               icon_url_sizes);
+  history_backend->SetFavicons(url2, FAVICON, favicon_bitmap_data);
   history_backend->Closing();
   }
 
@@ -1835,15 +1819,7 @@ TEST_F(AndroidProviderBackendTest, QueryWithoutThumbnailDB) {
   std::vector<history::FaviconBitmapData> favicon_bitmap_data;
   favicon_bitmap_data.push_back(bitmap_data_element);
 
-  FaviconSizes favicon_sizes;
-  favicon_sizes.push_back(gfx::Size());
-  IconURLSizesMap icon_url_sizes;
-  icon_url_sizes[GURL()] = favicon_sizes;
-
-  history_backend->SetFavicons(url2,
-                               FAVICON,
-                               favicon_bitmap_data,
-                               icon_url_sizes);
+  history_backend->SetFavicons(url2, FAVICON, favicon_bitmap_data);
   history_backend->Closing();
   }