Cleanup history favicon code

chrome/browser/history/android/android_provider_backend_unittest.cc

 // 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.
 
 #include "chrome/browser/history/android/android_provider_backend.h"
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 237 matching lines @@
   // Set favicon to url2.
   std::vector<unsigned char> data;
   data.push_back('1');
   history::FaviconBitmapData bitmap_data_element;
   bitmap_data_element.bitmap_data = new base::RefCountedBytes(data);
   bitmap_data_element.pixel_size = gfx::Size();
   bitmap_data_element.icon_url = GURL();
   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();
   }
 
   // The history_db_name and thumbnail_db_name files should be created by
   // HistoryBackend. We need to open the same database files.
   ASSERT_TRUE(file_util::PathExists(history_db_name_));
   ASSERT_TRUE(file_util::PathExists(thumbnail_db_name_));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, NULL));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
@@ skipping 129 matching lines @@
   // Set favicon to url2.
   std::vector<unsigned char> data;
   data.push_back('1');
   history::FaviconBitmapData bitmap_data_element;
   bitmap_data_element.bitmap_data = new base::RefCountedBytes(data);
   bitmap_data_element.pixel_size = gfx::Size();
   bitmap_data_element.icon_url = GURL();
   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();
   }
 
   // The history_db_name and thumbnail_db_name files should be created by
   // HistoryBackend. We need to open the same database files.
   ASSERT_TRUE(file_util::PathExists(history_db_name_));
   ASSERT_TRUE(file_util::PathExists(thumbnail_db_name_));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, NULL));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
@@ skipping 1393 matching lines @@
   // Set favicon to url2.
   std::vector<unsigned char> data;
   data.push_back('1');
   history::FaviconBitmapData bitmap_data_element;
   bitmap_data_element.bitmap_data = new base::RefCountedBytes(data);
   bitmap_data_element.pixel_size = gfx::Size();
   bitmap_data_element.icon_url = GURL();
   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();
   }
 
   // The history_db_name and thumbnail_db_name files should be created by
   // HistoryBackend. We need to open the same database files.
   ASSERT_TRUE(file_util::PathExists(history_db_name_));
   ASSERT_TRUE(file_util::PathExists(thumbnail_db_name_));
 
   // Only creates the history database
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, NULL));
@@ skipping 237 matching lines @@
                                                  update_args, &update_count));
   // Verify notifications.
   EXPECT_FALSE(delegate_.deleted_details());
   ASSERT_TRUE(delegate_.modified_details());
   ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   // No favicon will be updated as thumbnail database is missing.
   EXPECT_FALSE(delegate_.favicon_details());
 }
 
 }  // namespace history