Cleanup history favicon code

chrome/browser/history/android/android_provider_backend_unittest.cc

Index: chrome/browser/history/android/android_provider_backend_unittest.cc
diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc
index fe034ebf5984da253de572fadfd524e25de82752..e3831008933f5f19439e08c62afee4645d3a5bd9 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();
   }