Adds support for saving favicon size into history database.

chrome/browser/history/thumbnail_database_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 <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 508 matching lines @@
 
   FaviconID id = db.AddFavicon(icon_url, FAVICON, GetDefaultFaviconSizes(),
       favicon, time, gfx::Size());
   EXPECT_NE(0, db.AddIconMapping(page_url, id));
   std::vector<IconMapping> icon_mappings;
   EXPECT_TRUE(db.GetIconMappingsForPageURL(page_url, &icon_mappings));
 
   EXPECT_EQ(page_url, icon_mappings.front().page_url);
   EXPECT_EQ(id, icon_mappings.front().icon_id);
   EXPECT_EQ(FAVICON, icon_mappings.front().icon_type);
+  EXPECT_EQ(icon_url, icon_mappings.front().icon_url);
 
   // Add a touch icon
   std::vector<unsigned char> data2(blob2, blob2 + sizeof(blob2));
   scoped_refptr<base::RefCountedBytes> favicon2 =
       new base::RefCountedBytes(data);
 
   FaviconID id2 = db.AddFavicon(icon_url, TOUCH_ICON,
       GetDefaultFaviconSizes(), favicon2, time, gfx::Size());
   EXPECT_NE(0, db.AddIconMapping(page_url, id2));
 
   icon_mappings.clear();
   EXPECT_TRUE(db.GetIconMappingsForPageURL(page_url, &icon_mappings));
 
   EXPECT_EQ(page_url, icon_mappings.front().page_url);
   EXPECT_EQ(id2, icon_mappings.front().icon_id);
   EXPECT_EQ(TOUCH_ICON, icon_mappings.front().icon_type);
+  EXPECT_EQ(icon_url, icon_mappings.front().icon_url);
 
   // Add a touch precomposed icon
   scoped_refptr<base::RefCountedBytes> favicon3 =
       new base::RefCountedBytes(data2);
 
   FaviconID id3 = db.AddFavicon(icon_url, TOUCH_PRECOMPOSED_ICON,
       GetDefaultFaviconSizes(), favicon3, time, gfx::Size());
   EXPECT_NE(0, db.AddIconMapping(page_url, id3));
 
   icon_mappings.clear();
   EXPECT_TRUE(db.GetIconMappingsForPageURL(page_url, &icon_mappings));
 
   EXPECT_EQ(page_url, icon_mappings.front().page_url);
   EXPECT_EQ(id3, icon_mappings.front().icon_id);
   EXPECT_EQ(TOUCH_PRECOMPOSED_ICON, icon_mappings.front().icon_type);
+  EXPECT_EQ(icon_url, icon_mappings.front().icon_url);
 }
 
 // Test result of GetIconMappingsForPageURL when an icon type is passed in.
 TEST_F(ThumbnailDatabaseTest, GetIconMappingsForPageURLWithIconType) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
 
   GURL url("http://google.com");
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
@@ skipping 163 matching lines @@
 
   // Migration should be done.
   // Test one icon_mapping.
   GURL page_url1 = GURL("http://google.com/");
   std::vector<IconMapping> icon_mappings;
   EXPECT_TRUE(db.GetIconMappingsForPageURL(page_url1, &icon_mappings));
   ASSERT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(FAVICON, icon_mappings[0].icon_type);
   EXPECT_EQ(page_url1, icon_mappings[0].page_url);
   EXPECT_EQ(1, icon_mappings[0].icon_id);
-  GURL out_icon_url;
-  ASSERT_TRUE(db.GetFaviconHeader(
-      icon_mappings[0].icon_id, &out_icon_url, NULL, NULL));
-  EXPECT_EQ(icon1, out_icon_url);
+  EXPECT_EQ(icon1, icon_mappings[0].icon_url);
 
   // Test a page which has the same icon.
   GURL page_url3 = GURL("http://www.google.com/");
   icon_mappings.clear();
   EXPECT_TRUE(db.GetIconMappingsForPageURL(page_url3, &icon_mappings));
   ASSERT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(FAVICON, icon_mappings[0].icon_type);
   EXPECT_EQ(page_url3, icon_mappings[0].page_url);
   EXPECT_EQ(1, icon_mappings[0].icon_id);
+  EXPECT_EQ(icon1, icon_mappings[0].icon_url);
 
   // Test a icon_mapping with different IconID.
   GURL page_url2 = GURL("http://yahoo.com/");
   icon_mappings.clear();
   EXPECT_TRUE(db.GetIconMappingsForPageURL(page_url2, &icon_mappings));
   ASSERT_EQ(1u, icon_mappings.size());
   EXPECT_EQ(FAVICON, icon_mappings[0].icon_type);
   EXPECT_EQ(page_url2, icon_mappings[0].page_url);
   EXPECT_EQ(2, icon_mappings[0].icon_id);
-  ASSERT_TRUE(db.GetFaviconHeader(
-      icon_mappings[0].icon_id, &out_icon_url, NULL, NULL));
-  EXPECT_EQ(icon2, out_icon_url);
+  EXPECT_EQ(icon2, icon_mappings[0].icon_url);
 
   // Test a page without icon
   GURL page_url4 = GURL("http://www.google.com/blank.html");
   EXPECT_FALSE(db.GetIconMappingsForPageURL(page_url4, NULL));
 }
 
 TEST_F(ThumbnailDatabaseTest, IconMappingEnumerator) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
@@ skipping 29 matching lines @@
   // There are 2 favicon mappings.
   bool has_favicon_mapping1 = false;
   bool has_favicon_mapping2 = false;
   int mapping_count = 0;
   while (enumerator1.GetNextIconMapping(&icon_mapping)) {
     mapping_count++;
     if (favicon_mapping_id1 == icon_mapping.mapping_id) {
       has_favicon_mapping1 = true;
       EXPECT_EQ(url, icon_mapping.page_url);
       EXPECT_EQ(favicon_id1, icon_mapping.icon_id);
+      EXPECT_EQ(icon_url1, icon_mapping.icon_url);
       EXPECT_EQ(FAVICON, icon_mapping.icon_type);
     } else if (favicon_mapping_id2 == icon_mapping.mapping_id) {
       has_favicon_mapping2 = true;
       EXPECT_EQ(url2, icon_mapping.page_url);
       EXPECT_EQ(favicon_id2, icon_mapping.icon_id);
+      EXPECT_EQ(icon_url2, icon_mapping.icon_url);
       EXPECT_EQ(FAVICON, icon_mapping.icon_type);
     }
   }
   EXPECT_EQ(2, mapping_count);
   EXPECT_TRUE(has_favicon_mapping1);
   EXPECT_TRUE(has_favicon_mapping2);
 
   ThumbnailDatabase::IconMappingEnumerator enumerator2;
   ASSERT_TRUE(db.InitIconMappingEnumerator(TOUCH_ICON, &enumerator2));
   ASSERT_TRUE(enumerator2.GetNextIconMapping(&icon_mapping));
   EXPECT_EQ(touch_mapping_id1, icon_mapping.mapping_id);
   EXPECT_EQ(url, icon_mapping.page_url);
   EXPECT_EQ(touch_icon_id1, icon_mapping.icon_id);
+  EXPECT_EQ(icon_url1, icon_mapping.icon_url);
   EXPECT_EQ(TOUCH_ICON, icon_mapping.icon_type);
 
   EXPECT_FALSE(enumerator2.GetNextIconMapping(&icon_mapping));
 }
 
 TEST_F(ThumbnailDatabaseTest, FaviconSizesToAndFromString) {
   // Invalid input.
   FaviconSizes sizes_missing_height;
   ThumbnailDatabase::DatabaseStringToFaviconSizes("0 0 10",
       &sizes_missing_height);
@@ skipping 20 matching lines @@
   }
 
   std::string sizes_as_string;
   ThumbnailDatabase::FaviconSizesToDatabaseString(sizes_valid,
                                                   &sizes_as_string);
   EXPECT_TRUE(sizes_as_string == "10 15 20 25" ||
               sizes_as_string == "20 25 10 15");
 }
 
 }  // namespace history