Implementing URL prefix match for history thumbnail cache.

chrome/browser/history/top_sites_impl_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 "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/history/history_db_task.h"
@@ skipping 130 matching lines @@
   }
 
   // Returns true if history and top sites should be created in SetUp.
   virtual bool CreateHistoryAndTopSites() {
     return true;
   }
 
   // Gets the thumbnail for |url| from TopSites.
   SkBitmap GetThumbnail(const GURL& url) {
     scoped_refptr<base::RefCountedMemory> data;
-    return top_sites()->GetPageThumbnail(url, &data) ?
+    return top_sites()->GetPageThumbnail(url, false, &data) ?
         ExtractThumbnail(*data.get()) : SkBitmap();
   }
 
   // Creates a bitmap of the specified color. Caller takes ownership.
   gfx::Image CreateBitmap(SkColor color) {
     SkBitmap thumbnail;
     thumbnail.setConfig(SkBitmap::kARGB_8888_Config, 4, 4);
     thumbnail.allocPixels();
     thumbnail.eraseColor(color);
     return gfx::Image::CreateFrom1xBitmap(thumbnail);  // adds ref.
@@ skipping 309 matching lines @@
   base::Time now = base::Time::Now();
   ThumbnailScore low_score(1.0, true, true, now);
   ThumbnailScore medium_score(0.5, true, true, now);
   ThumbnailScore high_score(0.0, true, true, now);
 
   // Set the thumbnail.
   EXPECT_TRUE(top_sites()->SetPageThumbnail(url, thumbnail, medium_score));
 
   // Make sure the thumbnail was actually set.
   scoped_refptr<base::RefCountedMemory> result;
-  EXPECT_TRUE(top_sites()->GetPageThumbnail(url, &result));
+  EXPECT_TRUE(top_sites()->GetPageThumbnail(url, false, &result));
   EXPECT_TRUE(ThumbnailEqualsBytes(thumbnail, result.get()));
 
   // Reset the thumbnails and make sure we don't get it back.
   SetTopSites(MostVisitedURLList());
   RefreshTopSitesAndRecreate();
-  EXPECT_FALSE(top_sites()->GetPageThumbnail(url, &result));
+  EXPECT_FALSE(top_sites()->GetPageThumbnail(url, false, &result));
 }
 
 // Tests GetPageThumbnail.
 TEST_F(TopSitesImplTest, GetPageThumbnail) {
   MostVisitedURLList url_list;
   MostVisitedURL url1;
   url1.url = GURL("http://asdf.com");
   url1.redirects.push_back(url1.url);
   url_list.push_back(url1);
 
   MostVisitedURL url2;
   url2.url = GURL("http://gmail.com");
   url2.redirects.push_back(url2.url);
   url2.redirects.push_back(GURL("http://mail.google.com"));
   url_list.push_back(url2);
 
   SetTopSites(url_list);
 
   // Create a dummy thumbnail.
   gfx::Image thumbnail(CreateBitmap(SK_ColorWHITE));
   ThumbnailScore score(0.5, true, true, base::Time::Now());
 
   scoped_refptr<base::RefCountedMemory> result;
   EXPECT_TRUE(top_sites()->SetPageThumbnail(url1.url, thumbnail, score));
-  EXPECT_TRUE(top_sites()->GetPageThumbnail(url1.url, &result));
+  EXPECT_TRUE(top_sites()->GetPageThumbnail(url1.url, false, &result));
 
   EXPECT_TRUE(top_sites()->SetPageThumbnail(GURL("http://gmail.com"),
                                            thumbnail, score));
   EXPECT_TRUE(top_sites()->GetPageThumbnail(GURL("http://gmail.com"),
+                                            false,
                                             &result));
   // Get a thumbnail via a redirect.
   EXPECT_TRUE(top_sites()->GetPageThumbnail(GURL("http://mail.google.com"),
+                                            false,
                                             &result));
 
   EXPECT_TRUE(top_sites()->SetPageThumbnail(GURL("http://mail.google.com"),
                                            thumbnail, score));
-  EXPECT_TRUE(top_sites()->GetPageThumbnail(url2.url, &result));
+  EXPECT_TRUE(top_sites()->GetPageThumbnail(url2.url, false, &result));
 
   EXPECT_TRUE(ThumbnailEqualsBytes(thumbnail, result.get()));
 }
 
 // Tests GetMostVisitedURLs.
 TEST_F(TopSitesImplTest, GetMostVisited) {
   GURL news("http://news.google.com/");
   GURL google("http://google.com/");
 
   AddPageToHistory(news);
@@ skipping 40 matching lines @@
 
   {
     TopSitesQuerier querier;
     querier.QueryTopSites(top_sites(), false);
     ASSERT_EQ(1u + GetPrepopulatePages().size(), querier.urls().size());
     EXPECT_EQ(asdf_url, querier.urls()[0].url);
     EXPECT_EQ(asdf_title, querier.urls()[0].title);
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 1));
 
     scoped_refptr<base::RefCountedMemory> read_data;
-    EXPECT_TRUE(top_sites()->GetPageThumbnail(asdf_url, &read_data));
+    EXPECT_TRUE(top_sites()->GetPageThumbnail(asdf_url, false, &read_data));
     EXPECT_TRUE(ThumbnailEqualsBytes(tmp_bitmap, read_data.get()));
   }
 
   MostVisitedURL url2;
   url2.url = google_url;
   url2.title = google_title;
   url2.redirects.push_back(url2.url);
 
   AddPageToHistory(url2.url, url2.title);
 
@@ skipping 44 matching lines @@
   {
     TopSitesQuerier querier;
     querier.QueryTopSites(top_sites(), false);
 
     ASSERT_EQ(1u + GetPrepopulatePages().size(), querier.urls().size());
     EXPECT_EQ(asdf_url, querier.urls()[0].url);
     EXPECT_EQ(asdf_title, querier.urls()[0].title);
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 1));
 
     scoped_refptr<base::RefCountedMemory> read_data;
-    EXPECT_TRUE(top_sites()->GetPageThumbnail(asdf_url, &read_data));
+    EXPECT_TRUE(top_sites()->GetPageThumbnail(asdf_url, false, &read_data));
     EXPECT_TRUE(ThumbnailEqualsBytes(asdf_thumbnail, read_data.get()));
   }
 
   MostVisitedURL url2;
   url2.url = google3_url;
   url2.title = google_title;
   url2.redirects.push_back(google1_url);
   url2.redirects.push_back(google2_url);
   url2.redirects.push_back(google3_url);
 
@@ skipping 11 matching lines @@
 
   {
     scoped_refptr<base::RefCountedMemory> read_data;
     TopSitesQuerier querier;
     querier.QueryTopSites(top_sites(), false);
 
     ASSERT_EQ(2u + GetPrepopulatePages().size(), querier.urls().size());
     EXPECT_EQ(google1_url, querier.urls()[0].url);
     EXPECT_EQ(google_title, querier.urls()[0].title);
     ASSERT_EQ(3u, querier.urls()[0].redirects.size());
-    EXPECT_TRUE(top_sites()->GetPageThumbnail(google3_url, &read_data));
+    EXPECT_TRUE(top_sites()->GetPageThumbnail(google3_url, false, &read_data));
     EXPECT_TRUE(ThumbnailEqualsBytes(google_thumbnail, read_data.get()));
 
     EXPECT_EQ(asdf_url, querier.urls()[1].url);
     EXPECT_EQ(asdf_title, querier.urls()[1].title);
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 2));
   }
 
   gfx::Image weewar_bitmap(CreateBitmap(SK_ColorYELLOW));
 
   base::Time thumbnail_time(base::Time::Now());
   ThumbnailScore low_score(1.0, true, true, thumbnail_time);
   ThumbnailScore medium_score(0.5, true, true, thumbnail_time);
   ThumbnailScore high_score(0.0, true, true, thumbnail_time);
 
   // 1. Set to weewar. (Writes the thumbnail to the DB.)
   EXPECT_TRUE(top_sites()->SetPageThumbnail(google3_url,
                                             weewar_bitmap,
                                             medium_score));
   RefreshTopSitesAndRecreate();
   {
     scoped_refptr<base::RefCountedMemory> read_data;
-    EXPECT_TRUE(top_sites()->GetPageThumbnail(google3_url, &read_data));
+    EXPECT_TRUE(top_sites()->GetPageThumbnail(google3_url, false, &read_data));
     EXPECT_TRUE(ThumbnailEqualsBytes(weewar_bitmap, read_data.get()));
   }
 
   gfx::Image green_bitmap(CreateBitmap(SK_ColorGREEN));
 
   // 2. Set to google - low score.
   EXPECT_FALSE(top_sites()->SetPageThumbnail(google3_url,
                                              green_bitmap,
                                              low_score));
 
   // 3. Set to google - high score.
   EXPECT_TRUE(top_sites()->SetPageThumbnail(google1_url,
                                             green_bitmap,
                                             high_score));
 
   // Check that the thumbnail was updated.
   RefreshTopSitesAndRecreate();
   {
     scoped_refptr<base::RefCountedMemory> read_data;
-    EXPECT_TRUE(top_sites()->GetPageThumbnail(google3_url, &read_data));
+    EXPECT_TRUE(top_sites()->GetPageThumbnail(google3_url, false, &read_data));
     EXPECT_FALSE(ThumbnailEqualsBytes(weewar_bitmap, read_data.get()));
     EXPECT_TRUE(ThumbnailEqualsBytes(green_bitmap, read_data.get()));
   }
 }
 
 TEST_F(TopSitesImplTest, DeleteNotifications) {
   GURL google1_url("http://google.com");
   GURL google2_url("http://google.com/redirect");
   GURL google3_url("http://www.google.com");
   string16 google_title(ASCIIToUTF16("Google"));
@@ skipping 222 matching lines @@
                                              thumbnail,
                                              medium_score));
   // Store thumbnails for unknown (but valid) URLs temporarily - calls
   // AddTemporaryThumbnail.
   EXPECT_TRUE(top_sites()->SetPageThumbnail(unknown_url,
                                             thumbnail,
                                             medium_score));
 
   // We shouldn't get the thumnail back though (the url isn't in to sites yet).
   scoped_refptr<base::RefCountedMemory> out;
-  EXPECT_FALSE(top_sites()->GetPageThumbnail(unknown_url, &out));
+  EXPECT_FALSE(top_sites()->GetPageThumbnail(unknown_url, false, &out));
   // But we should be able to get the temporary page thumbnail score.
   ThumbnailScore out_score;
   EXPECT_TRUE(top_sites()->GetTemporaryPageThumbnailScore(unknown_url,
                                                           &out_score));
   EXPECT_TRUE(medium_score.Equals(out_score));
 
   std::vector<MostVisitedURL> list;
 
   MostVisitedURL mv;
   mv.url = unknown_url;
   mv.redirects.push_back(mv.url);
   mv.redirects.push_back(url1a);
   mv.redirects.push_back(url1b);
   list.push_back(mv);
 
   // Update URLs. This should result in using thumbnail.
   SetTopSites(list);
 
-  ASSERT_TRUE(top_sites()->GetPageThumbnail(unknown_url, &out));
+  ASSERT_TRUE(top_sites()->GetPageThumbnail(unknown_url, false, &out));
   EXPECT_TRUE(ThumbnailEqualsBytes(thumbnail, out.get()));
 }
 
 // Tests variations of blacklisting.
 TEST_F(TopSitesImplTest, Blacklisting) {
   MostVisitedURLList pages;
   MostVisitedURL url, url1;
   url.url = GURL("http://bbc.com/");
   url.redirects.push_back(url.url);
   pages.push_back(url);
@@ skipping 90 matching lines @@
 
   MostVisitedURLList pages = q.urls();
   EXPECT_FALSE(AddPrepopulatedPages(&pages));
 
   EXPECT_EQ(GetPrepopulatePages().size(), pages.size());
   q.set_urls(pages);
   ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(q, 0));
 }
 
 }  // namespace history