Changes favicon database to support storing bitmaps of different sizes for the same icon_url

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 257 matching lines @@
   sql.append(name);
   sql.append("("
              "id INTEGER PRIMARY KEY,"
              "url LONGVARCHAR NOT NULL,"
              "last_updated INTEGER DEFAULT 0,"
              "image_data BLOB)");
   EXPECT_TRUE(db.db_.Execute(sql.c_str()));
 
   EXPECT_TRUE(db.UpgradeToVersion4());
 
-  std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
-  scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
+  GURL url("http://google.com");
 
-  GURL url("http://google.com");
-  FaviconID id = db.AddFavicon(url, TOUCH_ICON);
-  base::Time time = base::Time::Now();
-  db.SetFavicon(id, favicon, time);
+  sql::Statement statement;
+  statement.Assign(db.db_.GetCachedStatement(SQL_FROM_HERE,
+      "INSERT INTO favicons (url, icon_type) VALUES (?, ?)"));
+  statement.BindString(0, URLDatabase::GURLToDatabaseURL(url));
+  statement.BindInt(1, TOUCH_ICON);
+  EXPECT_TRUE(statement.Run());
 
-  EXPECT_TRUE(0 < db.AddIconMapping(url, id));
-  IconMapping icon_mapping;
-  EXPECT_TRUE(db.GetIconMappingForPageURL(url, TOUCH_ICON, &icon_mapping));
-  EXPECT_EQ(url, icon_mapping.page_url);
-  EXPECT_EQ(id, icon_mapping.icon_id);
+  statement.Assign(db.db_.GetCachedStatement(SQL_FROM_HERE,
+      "SELECT icon_type FROM favicons"));
+  EXPECT_TRUE(statement.Step());
+
+  EXPECT_EQ(TOUCH_ICON, static_cast<IconType>(statement.ColumnInt(0)));
 }
 
 TEST_F(ThumbnailDatabaseTest, UpgradeToVersion5) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
 
   const char* name = "favicons";
   std::string sql;
   sql.append("DROP TABLE IF EXISTS ");
@@ skipping 10 matching lines @@
              "image_data BLOB,"
              "icon_type INTEGER DEFAULT 1)");
   ASSERT_TRUE(db.db_.Execute(sql.c_str()));
 
   ASSERT_TRUE(db.UpgradeToVersion5());
 
   sql = "SELECT sizes FROM favicons";
   EXPECT_TRUE(db.db_.Execute(sql.c_str()));
 }
 
+TEST_F(ThumbnailDatabaseTest, UpgradeToVersion6) {
+  ThumbnailDatabase db;
+  ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
+  db.BeginTransaction();
+
+  const char* name = "favicons";
+  std::string sql;
+  sql.append("DROP TABLE IF EXISTS ");
+  sql.append(name);
+  EXPECT_TRUE(db.db_.Execute(sql.c_str()));
+
+  sql.resize(0);
+  sql.append("CREATE TABLE ");
+  sql.append(name);
+  sql.append("("
+             "id INTEGER PRIMARY KEY,"
+             "url LONGVARCHAR NOT NULL,"
+             "last_updated INTEGER DEFAULT 0,"
+             "image_data BLOB,"
+             "icon_type INTEGER DEFAULT 1,"
+             "sizes LONGVARCHAR)");
+  EXPECT_TRUE(db.db_.Execute(sql.c_str()));
+
+  GURL url("http://google.com");
+
+  sql::Statement statement;
+  statement.Assign(db.db_.GetCachedStatement(SQL_FROM_HERE,
+      "INSERT INTO favicons (url, icon_type) VALUES (?, ?)"));
+  statement.BindString(0, URLDatabase::GURLToDatabaseURL(url));
+  statement.BindInt(1, FAVICON);
+  EXPECT_TRUE(statement.Run());
+
+  statement.Assign(db.db_.GetCachedStatement(SQL_FROM_HERE,
+      "INSERT INTO favicons (url, icon_type) VALUES (?, ?)"));
+  statement.BindString(0, URLDatabase::GURLToDatabaseURL(url));
+  statement.BindInt(1, TOUCH_ICON);
+  EXPECT_TRUE(statement.Run());
+
+  EXPECT_TRUE(db.UpgradeToVersion6());
+
+  statement.Assign(db.db_.GetCachedStatement(SQL_FROM_HERE,
+      "SELECT icon_type, size FROM favicons ORDER BY icon_type ASC"));
+
+  EXPECT_TRUE(statement.Step());
+  EXPECT_EQ(FAVICON, statement.ColumnInt(0));
+  EXPECT_EQ(16, statement.ColumnInt(1));
+
+  EXPECT_TRUE(statement.Step());
+  EXPECT_EQ(TOUCH_ICON, statement.ColumnInt(0));
+  EXPECT_EQ(0, statement.ColumnInt(1));
+}
+
 TEST_F(ThumbnailDatabaseTest, TemporayIconMapping) {
   ThumbnailDatabase db;
 
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
 
   db.BeginTransaction();
 
   EXPECT_TRUE(db.InitTemporaryIconMappingTable());
 
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
@@ skipping 282 matching lines @@
   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(TOUCH_ICON, icon_mapping.icon_type);
 
   EXPECT_FALSE(enumerator2.GetNextIconMapping(&icon_mapping));
 }
 
 }  // namespace history