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 1216 matching lines @@
   // 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::string favicon_data(
-      favicon.image_data->front(),
-      favicon.image_data->front() + favicon.image_data->size());
+      favicon.first_bitmap()->front(),
+      favicon.first_bitmap()->front() + favicon.first_bitmap()->size());
 
   EXPECT_EQ(FAVICON, favicon.icon_type);
   EXPECT_EQ(icon_url, favicon.icon_url);
   EXPECT_EQ(blob_data, favicon_data);
 
   // Test the touch icon for this URL.
   ASSERT_TRUE(backend_->GetFaviconFromDB(url, TOUCH_ICON, &favicon));
   std::string touchicon_data(
-      favicon.image_data->front(),
-      favicon.image_data->front() + favicon.image_data->size());
+      favicon.first_bitmap()->front(),
+      favicon.first_bitmap()->front() + favicon.first_bitmap()->size());
 
   EXPECT_EQ(TOUCH_ICON, favicon.icon_type);
   EXPECT_EQ(icon_url, favicon.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");
@@ skipping 348 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