Change HistoryAndBookmarkRow favicon_ field to be scoped_refptr<base::RefCountedMemory>

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 479 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));
   EXPECT_EQ(data, png_icon_data);
 
   // Remove favicon.
   HistoryAndBookmarkRow update_row2;
 
   // Set favicon.
-  update_row1.set_favicon(std::vector<unsigned char>());
+  update_row1.set_favicon(new base::RefCountedBytes());
   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());
@@ skipping 376 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 146 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));
 
   AndroidURLID id1 = backend->InsertHistoryAndBookmark(row1);
   ASSERT_TRUE(id1);
   AndroidURLID id2 = backend->InsertHistoryAndBookmark(row2);
   ASSERT_TRUE(id2);
   content::RunAllPendingInMessageLoop();
 
   // Query by folder=0, the row1 should returned.
   std::vector<HistoryAndBookmarkRow::ColumnID> projections;
 
   projections.push_back(HistoryAndBookmarkRow::URL);
 
   scoped_ptr<AndroidStatement> statement(backend->QueryHistoryAndBookmarks(
       projections, std::string("folder=0"), std::vector<string16>(),
       std::string("url ASC")));
   ASSERT_TRUE(statement->statement()->Step());
   EXPECT_EQ(row1.raw_url(), statement->statement()->ColumnString(0));
   EXPECT_FALSE(statement->statement()->Step());
 
   // 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