Adds support for saving favicon size into history database.

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 233 matching lines @@
   URLRow url_row;
 
   ASSERT_TRUE(history_backend->GetURL(url1, &url_row));
   url_id1 = url_row.id();
   ASSERT_TRUE(history_backend->GetURL(url2, &url_row));
   url_id2 = url_row.id();
 
   // Set favicon to url2.
   std::vector<unsigned char> data;
   data.push_back('1');
-  history_backend->SetFavicon(url2,
-                              GURL(),
-                              new base::RefCountedBytes(data),
-                              FAVICON);
+  FaviconDataElement element;
+  element.bitmap_data = base::RefCountedBytes::TakeVector(&data);
+  element.pixel_size = gfx::Size();
+  element.icon_url = GURL();
+  std::vector<FaviconDataElement> elements;
+  elements.push_back(element);
+
+  IconURLFaviconIDMap icon_url_favicon_ids;
+  icon_url_favicon_ids[GURL()] = FaviconSizes("0 0");
+
+  history_backend->SetFavicons(url2,
+                               FAVICON,
+                               elements,
+                               icon_url_favicon_ids);
   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_, bookmark_temp_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
@@ skipping 122 matching lines @@
   ASSERT_TRUE(history_backend->UpdateURL(url_id1, url_row));
 
   ASSERT_TRUE(history_backend->GetURL(url2, &url_row));
   url_id2 = url_row.id();
   url_row.set_title(title2);
   ASSERT_TRUE(history_backend->UpdateURL(url_id2, url_row));
 
   // Set favicon to url2.
   std::vector<unsigned char> data;
   data.push_back('1');
-  history_backend->SetFavicon(url2,
-                              GURL(),
-                              new base::RefCountedBytes(data),
-                              FAVICON);
+  FaviconDataElement element;
+  element.bitmap_data = base::RefCountedBytes::TakeVector(&data);
+  element.pixel_size = gfx::Size();
+  element.icon_url = GURL();
+  std::vector<FaviconDataElement> elements;
+  elements.push_back(element);
+
+  IconURLFaviconIDMap icon_url_favicon_ids;
+  icon_url_favicon_ids[GURL()] = FaviconSizes("0 0");
+
+  history_backend->SetFavicons(url2,
+                               FAVICON,
+                               elements,
+                               icon_url_favicon_ids);
   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_, bookmark_temp_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
@@ skipping 76 matching lines @@
   row1.set_title(UTF8ToUTF16("cnn"));
 
   HistoryAndBookmarkRow row2;
   row2.set_raw_url("http://www.example.com");
   row2.set_url(GURL("http://www.example.com"));
   row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10));
   row2.set_is_bookmark(false);
   row2.set_title(UTF8ToUTF16("example"));
   std::vector<unsigned char> data;
   data.push_back('1');
-  row2.set_favicon(data);
+  row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
                                              &history_db_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_, &history_db_,
                                  &thumbnail_db_, bookmark_model_, &delegate_));
 
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1));
   EXPECT_FALSE(delegate_.deleted_details());
@@ skipping 88 matching lines @@
   row1.set_title(UTF8ToUTF16("cnn"));
 
   HistoryAndBookmarkRow row2;
   row2.set_raw_url("http://www.example.com");
   row2.set_url(GURL("http://www.example.com"));
   row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10));
   row2.set_is_bookmark(false);
   row2.set_title(UTF8ToUTF16("example"));
   std::vector<unsigned char> data;
   data.push_back('1');
-  row2.set_favicon(data);
+  row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
                                              &history_db_));
 
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_, &history_db_,
                                  &thumbnail_db_, bookmark_model_, &delegate_));
 
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row1));
@@ skipping 168 matching lines @@
   row1.set_title(UTF8ToUTF16("cnn"));
 
   HistoryAndBookmarkRow row2;
   row2.set_raw_url("http://www.example.com");
   row2.set_url(GURL("http://www.example.com"));
   row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10));
   row2.set_is_bookmark(false);
   row2.set_title(UTF8ToUTF16("example"));
   std::vector<unsigned char> data;
   data.push_back('1');
-  row2.set_favicon(data);
+  row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
                                              &history_db_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_, &history_db_,
                                  &thumbnail_db_, bookmark_model_, &delegate_));
 
   AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
   ASSERT_TRUE(id1);
@@ skipping 159 matching lines @@
   row1.set_title(UTF8ToUTF16("cnn"));
 
   HistoryAndBookmarkRow row2;
   row2.set_raw_url("http://www.example.com");
   row2.set_url(GURL("http://www.example.com"));
   row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10));
   row2.set_is_bookmark(false);
   row2.set_title(UTF8ToUTF16("example"));
   std::vector<unsigned char> data;
   data.push_back('1');
-  row2.set_favicon(data);
+  row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
                                              &history_db_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_, &history_db_,
                                  &thumbnail_db_, bookmark_model_, &delegate_));
 
   AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
   ASSERT_TRUE(id1);
@@ skipping 60 matching lines @@
   row1.set_title(UTF8ToUTF16("cnn"));
 
   HistoryAndBookmarkRow row2;
   row2.set_raw_url("http://www.example.com");
   row2.set_url(GURL("http://www.example.com"));
   row2.set_last_visit_time(Time::Now() - TimeDelta::FromDays(10));
   row2.set_is_bookmark(false);
   row2.set_title(UTF8ToUTF16("example"));
   std::vector<unsigned char> data;
   data.push_back('1');
-  row2.set_favicon(data);
+  row2.set_favicon(base::RefCountedBytes::TakeVector(&data));
 
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
                                              &history_db_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_, &history_db_,
                                  &thumbnail_db_, bookmark_model_, &delegate_));
 
   AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
   ASSERT_TRUE(id1);
@@ skipping 61 matching lines @@
   ASSERT_TRUE(id1);
 
   int update_count;
   std::vector<string16> update_args;
   // Update the last visit time to a value greater than current one.
   HistoryAndBookmarkRow update_row1;
 
   // Set favicon.
   std::vector<unsigned char> data;
   data.push_back('1');
-  update_row1.set_favicon(data);
+  update_row1.set_favicon(base::RefCountedBytes::TakeVector(&data));
   update_args.push_back(UTF8ToUTF16(row1.raw_url()));
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->UpdateHistoryAndBookmarks(update_row1, "url = ?",
                                                  update_args, &update_count));
   // Verify notifications.
   EXPECT_FALSE(delegate_.deleted_details());
   EXPECT_FALSE(delegate_.modified_details());
   ASSERT_TRUE(delegate_.favicon_details());
   ASSERT_EQ(1u, delegate_.favicon_details()->urls.size());
   ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
               delegate_.favicon_details()->urls.find(row1.url()));
 
-  IconMapping icon_mapping;
-  EXPECT_TRUE(thumbnail_db_.GetIconMappingForPageURL(row1.url(), FAVICON,
-                                                     &icon_mapping));
-  Time last_updated;
-  std::vector<unsigned char> png_icon_data;
-  EXPECT_TRUE(thumbnail_db_.GetFavicon(icon_mapping.icon_id, &last_updated,
-                                       &png_icon_data, NULL, NULL));
+  std::vector<IconMapping> icon_mappings;
+  EXPECT_TRUE(thumbnail_db_.GetIconMappingsForPageURL(row1.url(), FAVICON,
+                                                      &icon_mappings));
+  EXPECT_EQ(1u, icon_mappings.size());
+  std::vector<FaviconBitmap> favicon_bitmaps;
+  EXPECT_TRUE(thumbnail_db_.GetFaviconBitmaps(icon_mappings[0].icon_id,
+                                              &favicon_bitmaps));
+  EXPECT_EQ(1u, favicon_bitmaps.size());
+  std::vector<unsigned char> png_icon_data(
+      favicon_bitmaps[0].bitmap_data->front(),
+      favicon_bitmaps[0].bitmap_data->front() +
+          favicon_bitmaps[0].bitmap_data->size());
   EXPECT_EQ(data, png_icon_data);
 
   // Remove favicon.
   HistoryAndBookmarkRow update_row2;
 
   // Set favicon.
   update_row1.set_favicon(std::vector<unsigned char>());
   update_args.clear();
   update_args.push_back(UTF8ToUTF16(row1.raw_url()));
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->UpdateHistoryAndBookmarks(update_row1, "url = ?",
                                                  update_args, &update_count));
   // Verify notifications.
   EXPECT_FALSE(delegate_.deleted_details());
   EXPECT_FALSE(delegate_.modified_details());
   ASSERT_TRUE(delegate_.favicon_details());
   ASSERT_EQ(1u, delegate_.favicon_details()->urls.size());
   ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
               delegate_.favicon_details()->urls.find(row1.url()));
 
-  EXPECT_FALSE(thumbnail_db_.GetIconMappingForPageURL(row1.url(), FAVICON,
-                                                      NULL));
+  EXPECT_FALSE(thumbnail_db_.GetIconMappingsForPageURL(row1.url(), FAVICON,
+                                                       NULL));
 }
 
 TEST_F(AndroidProviderBackendTest, UpdateSearchTermTable) {
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, bookmark_temp_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_, NULL,
                                              &history_db_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_, &history_db_,
                                  &thumbnail_db_, bookmark_model_, &delegate_));
   // Insert a keyword search item to verify if the update succeeds.
@@ skipping 558 matching lines @@
   // Query by folder=1, the row2 should returned.
   statement.reset(backend->QueryHistoryAndBookmarks(
       projections, std::string("folder=1"), std::vector<string16>(),
       std::string("url ASC")));
   ASSERT_TRUE(statement->statement()->Step());
   EXPECT_EQ(row2.url(), GURL(statement->statement()->ColumnString(0)));
   EXPECT_FALSE(statement->statement()->Step());
 }
 
 }  // namespace history