Change FaviconData to be able to return data for multiple bitmaps for same icon URL

chrome/browser/history/history_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 <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 106 matching lines @@
     most_visited_list_.swap(data);
   }
 
   // Callback for QueryFiltered.
   void OnQueryFiltered(CancelableRequestProvider::Handle handle,
                        const history::FilteredURLList& data) {
     filtered_list_ = data;
   }
 
   // Callback for UpdateFaviconMappingsAndFetch.
-  void OnFaviconData(FaviconService::Handle handle,
-                     history::FaviconData favicon_data) {
+  void OnFaviconResults(
+      FaviconService::Handle handle,
+      std::vector<history::FaviconBitmapResult> favicon_bitmap_results,
+      history::IconURLSizesMap icon_url_sizes) {
   }
 
   const history::MostVisitedURLList& get_most_visited_list() const {
     return most_visited_list_;
   }
 
   const history::FilteredURLList& get_filtered_list() const {
     return filtered_list_;
   }
 
@@ skipping 1078 matching lines @@
 TEST_F(HistoryBackendTest, SetSameFaviconURLForTwoPages) {
   GURL favicon_url("http://www.google.com/favicon.ico");
   GURL page_url1("http://www.google.com");
   GURL page_url2("http://www.google.ca");
 
   scoped_refptr<base::RefCountedMemory> bitmap_data(
       new base::RefCountedBytes());
   backend_->SetFavicon(page_url1, favicon_url, bitmap_data, FAVICON);
 
   scoped_refptr<GetFaviconRequest> request(new GetFaviconRequest(
-      base::Bind(&HistoryBackendTest::OnFaviconData, base::Unretained(this))));
+      base::Bind(&HistoryBackendTest::OnFaviconResults,
+                 base::Unretained(this))));
   HistoryBackendCancelableRequest cancellable_request;
   cancellable_request.MockScheduleOfRequest<GetFaviconRequest>(request);
   backend_->UpdateFaviconMappingAndFetch(request, page_url2, favicon_url,
                                          FAVICON);
 
   // Check that the same FaviconID is mapped to both page URLs.
   std::vector<IconMapping> icon_mappings1;
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(
       page_url1, &icon_mappings1));
   EXPECT_EQ(1u, icon_mappings1.size());
@@ skipping 46 matching lines @@
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingForPageURL(
       url, FAVICON, NULL));
 
   // Add a touch_icon
   backend_->SetFavicon(
       url, icon_url, bytes.get(), TOUCH_ICON);
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingForPageURL(
       url, TOUCH_ICON, NULL));
 
   // Test the Fav icon for this URL.
-  FaviconData favicon;
-  ASSERT_TRUE(backend_->GetFaviconFromDB(url, FAVICON, &favicon));
+  std::vector<FaviconBitmapResult> favicon_bitmap_results;
+  ASSERT_TRUE(backend_->GetFaviconFromDB(url, FAVICON,
+                                         &favicon_bitmap_results));
+  EXPECT_EQ(1u, favicon_bitmap_results.size());
+  FaviconBitmapResult bitmap_result = favicon_bitmap_results[0];
   std::string favicon_data(
-      favicon.image_data->front(),
-      favicon.image_data->front() + favicon.image_data->size());
+      bitmap_result.bitmap_data->front(),
+      bitmap_result.bitmap_data->front() + bitmap_result.bitmap_data->size());
 
-  EXPECT_EQ(FAVICON, favicon.icon_type);
-  EXPECT_EQ(icon_url, favicon.icon_url);
+  EXPECT_EQ(FAVICON, bitmap_result.icon_type);
+  EXPECT_EQ(icon_url, bitmap_result.icon_url);
   EXPECT_EQ(blob_data, favicon_data);
 
   // Test the touch icon for this URL.
-  ASSERT_TRUE(backend_->GetFaviconFromDB(url, TOUCH_ICON, &favicon));
+  ASSERT_TRUE(backend_->GetFaviconFromDB(url, TOUCH_ICON,
+                                         &favicon_bitmap_results));
+  EXPECT_EQ(1u, favicon_bitmap_results.size());
+  bitmap_result = favicon_bitmap_results[0];
   std::string touchicon_data(
-      favicon.image_data->front(),
-      favicon.image_data->front() + favicon.image_data->size());
+      bitmap_result.bitmap_data->front(),
+      bitmap_result.bitmap_data->front() + bitmap_result.bitmap_data->size());
 
-  EXPECT_EQ(TOUCH_ICON, favicon.icon_type);
-  EXPECT_EQ(icon_url, favicon.icon_url);
+  EXPECT_EQ(TOUCH_ICON, bitmap_result.icon_type);
+  EXPECT_EQ(icon_url, bitmap_result.icon_url);
   EXPECT_EQ(blob_data, touchicon_data);
 }
 
 TEST_F(HistoryBackendTest, CloneFaviconIsRestrictedToSameDomain) {
   const GURL url("http://www.google.com/");
   const GURL icon_url("http://www.google.com/icon");
   const GURL same_domain_url("http://www.google.com/subdir/index.html");
   const GURL foreign_domain_url("http://www.not-google.com/");
 
   // Add a favicon
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> bytes(new base::RefCountedBytes(data));
   backend_->SetFavicon(
       url, icon_url, bytes.get(), FAVICON);
   EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingForPageURL(
       url, FAVICON, NULL));
 
   // Validate starting state.
-  FaviconData favicon;
-  EXPECT_TRUE(backend_->GetFaviconFromDB(url, FAVICON, &favicon));
-  EXPECT_FALSE(backend_->GetFaviconFromDB(same_domain_url, FAVICON, &favicon));
-  EXPECT_FALSE(backend_->GetFaviconFromDB(foreign_domain_url,
-                                          FAVICON, &favicon));
+  std::vector<FaviconBitmapResult> favicon_bitmap_results;
+  EXPECT_TRUE(backend_->GetFaviconFromDB(url, FAVICON,
+                                         &favicon_bitmap_results));
+  EXPECT_FALSE(backend_->GetFaviconFromDB(same_domain_url, FAVICON,
+                                          &favicon_bitmap_results));
+  EXPECT_FALSE(backend_->GetFaviconFromDB(foreign_domain_url, FAVICON,
+                                          &favicon_bitmap_results));
 
   // Same-domain cloning should work.
   backend_->CloneFavicon(url, same_domain_url);
-  EXPECT_TRUE(backend_->GetFaviconFromDB(same_domain_url, FAVICON, &favicon));
+  EXPECT_TRUE(backend_->GetFaviconFromDB(same_domain_url, FAVICON,
+                                         &favicon_bitmap_results));
 
   // Foreign-domain cloning is forbidden.
   backend_->CloneFavicon(url, foreign_domain_url);
-  EXPECT_FALSE(backend_->GetFaviconFromDB(foreign_domain_url,
-                                          FAVICON, &favicon));
+  EXPECT_FALSE(backend_->GetFaviconFromDB(foreign_domain_url, FAVICON,
+                                          &favicon_bitmap_results));
 }
 
 TEST_F(HistoryBackendTest, QueryFilteredURLs) {
   const char* google = "http://www.google.com/";
   const char* yahoo = "http://www.yahoo.com/";
   const char* yahoo_sports = "http://sports.yahoo.com/";
   const char* yahoo_sports_with_article1 =
       "http://sports.yahoo.com/article1.htm";
   const char* yahoo_sports_with_article2 =
       "http://sports.yahoo.com/article2.htm";
@@ skipping 313 matching lines @@
 
     backend_->DeleteURL(url);
     backend_->AddPageNoVisitForBookmark(url, string16());
     backend_->GetURL(url, &row);
     EXPECT_EQ(url, row.url());
     EXPECT_EQ(UTF8ToUTF16(url.spec()), row.title());
     EXPECT_EQ(0, row.visit_count());
 }
 
 }  // namespace history