Remove dependency on Profile's IsOffTheRecord in favicon_handler.

chrome/browser/favicon/favicon_handler_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/memory/scoped_ptr.h"
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
+#include "components/favicon/content/content_favicon_driver.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 
 class TestFaviconHandler;
@@ skipping 139 matching lines @@
   const std::vector<unsigned char> bitmap_data_;
   std::vector<chrome::FaviconBitmapResult> history_results_;
   FaviconService::FaviconResultsCallback callback_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HistoryRequestHandler);
 };
 
 }  // namespace
 
+class MockFaviconDriver : public FaviconDriver {

[blundell, 2014/04/08 10:01:19]

s/Mock/Test

[jif, 2014/04/08 11:55:47]

Done.

+  virtual bool IsOffTheRecord() OVERRIDE { return false; }
+};
 
 class TestFaviconHandlerDelegate : public FaviconHandlerDelegate {
  public:
   TestFaviconHandlerDelegate() {
   }
 
   virtual ~TestFaviconHandlerDelegate() {
   }
 
   virtual NavigationEntry* GetActiveEntry() OVERRIDE {
@@ skipping 18 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestFaviconHandlerDelegate);
 };
 
 // This class is used to catch the FaviconHandler's download and history
 // request, and also provide the methods to access the FaviconHandler
 // internals.
 class TestFaviconHandler : public FaviconHandler {
  public:
   TestFaviconHandler(const GURL& page_url,
                      Profile* profile,
+                     FaviconDriver* driver,
                      FaviconHandlerDelegate* delegate,
                      Type type)
-      : FaviconHandler(profile, delegate, type),
+      : FaviconHandler(profile, driver, delegate, type),
         entry_(NavigationEntry::Create()),
         download_id_(0),
         num_favicon_updates_(0) {
     entry_->SetURL(page_url);
     download_handler_.reset(new DownloadHandler(this));
   }
 
   virtual ~TestFaviconHandler() {
   }
 
@@ skipping 209 matching lines @@
       ScopedSetSupportedScaleFactors;
   ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
   DISALLOW_COPY_AND_ASSIGN(FaviconHandlerTest);
 };
 
 TEST_F(FaviconHandlerTest, GetFaviconFromHistory) {
   const GURL page_url("http://www.google.com");
   const GURL icon_url("http://www.google.com/favicon");
 
   TestFaviconHandlerDelegate delegate;
+  MockFaviconDriver driver;
   Profile* profile = Profile::FromBrowserContext(
       web_contents()->GetBrowserContext());
-  TestFaviconHandler helper(page_url, profile,
-                            &delegate, FaviconHandler::FAVICON);
+  TestFaviconHandler helper(
+      page_url, profile, &driver, &delegate, FaviconHandler::FAVICON);
 
   helper.FetchFavicon(page_url);
   HistoryRequestHandler* history_handler = helper.history_handler();
   // Ensure the data given to history is correct.
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(chrome::FAVICON, history_handler->icon_type_);
 
   SetFaviconBitmapResult(icon_url, &history_handler->history_results_);
@@ skipping 18 matching lines @@
 
   // Favicon shouldn't request to download icon.
   EXPECT_FALSE(helper.download_handler()->HasDownload());
 }
 
 TEST_F(FaviconHandlerTest, DownloadFavicon) {
   const GURL page_url("http://www.google.com");
   const GURL icon_url("http://www.google.com/favicon");
 
   TestFaviconHandlerDelegate delegate;
+  MockFaviconDriver driver;
   Profile* profile = Profile::FromBrowserContext(
       web_contents()->GetBrowserContext());
-  TestFaviconHandler helper(page_url, profile,
-                            &delegate, FaviconHandler::FAVICON);
+  TestFaviconHandler helper(
+      page_url, profile, &driver, &delegate, FaviconHandler::FAVICON);
 
   helper.FetchFavicon(page_url);
   HistoryRequestHandler* history_handler = helper.history_handler();
   // Ensure the data given to history is correct.
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(chrome::FAVICON, history_handler->icon_type_);
 
   // Set icon data expired
@@ skipping 45 matching lines @@
   EXPECT_FALSE(favicon_status.image.IsEmpty());
   EXPECT_EQ(gfx::kFaviconSize, favicon_status.image.Width());
 }
 
 TEST_F(FaviconHandlerTest, UpdateAndDownloadFavicon) {
   const GURL page_url("http://www.google.com");
   const GURL icon_url("http://www.google.com/favicon");
   const GURL new_icon_url("http://www.google.com/new_favicon");
 
   TestFaviconHandlerDelegate delegate;
+  MockFaviconDriver driver;
   Profile* profile = Profile::FromBrowserContext(
       web_contents()->GetBrowserContext());
-  TestFaviconHandler helper(page_url, profile,
-                            &delegate, FaviconHandler::FAVICON);
+  TestFaviconHandler helper(
+      page_url, profile, &driver, &delegate, FaviconHandler::FAVICON);
 
   helper.FetchFavicon(page_url);
   HistoryRequestHandler* history_handler = helper.history_handler();
   // Ensure the data given to history is correct.
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(chrome::FAVICON, history_handler->icon_type_);
 
   // Set valid icon data.
@@ skipping 59 matching lines @@
   EXPECT_TRUE(favicon_status.valid);
   EXPECT_FALSE(favicon_status.image.IsEmpty());
   EXPECT_EQ(gfx::kFaviconSize, favicon_status.image.Width());
 }
 
 TEST_F(FaviconHandlerTest, FaviconInHistoryInvalid) {
   const GURL page_url("http://www.google.com");
   const GURL icon_url("http://www.google.com/favicon");
 
   TestFaviconHandlerDelegate delegate;
+  MockFaviconDriver driver;
   Profile* profile = Profile::FromBrowserContext(
       web_contents()->GetBrowserContext());
-  TestFaviconHandler helper(page_url, profile,
-                            &delegate, FaviconHandler::FAVICON);
+  TestFaviconHandler helper(
+      page_url, profile, &driver, &delegate, FaviconHandler::FAVICON);
 
   helper.FetchFavicon(page_url);
   HistoryRequestHandler* history_handler = helper.history_handler();
   // Ensure the data given to history is correct.
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(chrome::FAVICON, history_handler->icon_type_);
 
   // Set non empty but invalid data.
@@ skipping 50 matching lines @@
   EXPECT_FALSE(favicon_status.image.IsEmpty());
   EXPECT_EQ(gfx::kFaviconSize, favicon_status.image.Width());
 }
 
 TEST_F(FaviconHandlerTest, UpdateFavicon) {
   const GURL page_url("http://www.google.com");
   const GURL icon_url("http://www.google.com/favicon");
   const GURL new_icon_url("http://www.google.com/new_favicon");
 
   TestFaviconHandlerDelegate delegate;
+  MockFaviconDriver driver;
   Profile* profile = Profile::FromBrowserContext(
       web_contents()->GetBrowserContext());
-  TestFaviconHandler helper(page_url, profile,
-                            &delegate, FaviconHandler::FAVICON);
+  TestFaviconHandler helper(
+      page_url, profile, &driver, &delegate, FaviconHandler::FAVICON);
 
   helper.FetchFavicon(page_url);
   HistoryRequestHandler* history_handler = helper.history_handler();
   // Ensure the data given to history is correct.
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(chrome::FAVICON, history_handler->icon_type_);
 
   SetFaviconBitmapResult(icon_url, &history_handler->history_results_);
@@ skipping 39 matching lines @@
   EXPECT_TRUE(helper.GetEntry()->GetFavicon().valid);
   EXPECT_FALSE(helper.GetEntry()->GetFavicon().image.IsEmpty());
 }
 
 TEST_F(FaviconHandlerTest, Download2ndFaviconURLCandidate) {
   const GURL page_url("http://www.google.com");
   const GURL icon_url("http://www.google.com/favicon");
   const GURL new_icon_url("http://www.google.com/new_favicon");
 
   TestFaviconHandlerDelegate delegate;
+  MockFaviconDriver driver;
   Profile* profile = Profile::FromBrowserContext(
       web_contents()->GetBrowserContext());
-  TestFaviconHandler helper(page_url, profile,
-                            &delegate, FaviconHandler::TOUCH);
+  TestFaviconHandler helper(
+      page_url, profile, &driver, &delegate, FaviconHandler::TOUCH);
 
   helper.FetchFavicon(page_url);
   HistoryRequestHandler* history_handler = helper.history_handler();
   // Ensure the data given to history is correct.
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(chrome::TOUCH_PRECOMPOSED_ICON | chrome::TOUCH_ICON,
             history_handler->icon_type_);
 
@@ skipping 89 matching lines @@
   EXPECT_LT(0U, history_handler->bitmap_data_.size());
   EXPECT_EQ(page_url, history_handler->page_url_);
 }
 
 TEST_F(FaviconHandlerTest, UpdateDuringDownloading) {
   const GURL page_url("http://www.google.com");
   const GURL icon_url("http://www.google.com/favicon");
   const GURL new_icon_url("http://www.google.com/new_favicon");
 
   TestFaviconHandlerDelegate delegate;
+  MockFaviconDriver driver;
   Profile* profile = Profile::FromBrowserContext(
       web_contents()->GetBrowserContext());
-  TestFaviconHandler helper(page_url, profile,
-                            &delegate, FaviconHandler::TOUCH);
+  TestFaviconHandler helper(
+      page_url, profile, &driver, &delegate, FaviconHandler::TOUCH);
 
   helper.FetchFavicon(page_url);
   HistoryRequestHandler* history_handler = helper.history_handler();
   // Ensure the data given to history is correct.
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(page_url, history_handler->page_url_);
   EXPECT_EQ(GURL(), history_handler->icon_url_);
   EXPECT_EQ(chrome::TOUCH_PRECOMPOSED_ICON | chrome::TOUCH_ICON,
             history_handler->icon_type_);
 
@@ skipping 120 matching lines @@
   scale_factors.push_back(ui::SCALE_FACTOR_100P);
   scale_factors.push_back(ui::SCALE_FACTOR_200P);
   ui::test::ScopedSetSupportedScaleFactors scoped_supported(scale_factors);
 
   Profile* profile = Profile::FromBrowserContext(
       web_contents()->GetBrowserContext());
 
   // 1) Test that if there are several single resolution favicons to choose from
   // that the largest exact match is chosen.
   TestFaviconHandlerDelegate delegate1;
-  TestFaviconHandler handler1(kPageURL, profile,
-                              &delegate1, FaviconHandler::FAVICON);
+  MockFaviconDriver driver;
+  TestFaviconHandler handler1(
+      kPageURL, profile, &driver, &delegate1, FaviconHandler::FAVICON);
   const int kSizes1[] = { 16, 24, 32, 48, 256 };
   std::vector<FaviconURL> urls1(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSizes1));
   DownloadTillDoneIgnoringHistory(&handler1, kPageURL, urls1, kSizes1);
 
   content::FaviconStatus favicon_status1(handler1.GetEntry()->GetFavicon());
   EXPECT_EQ(0u, handler1.image_urls().size());
   EXPECT_TRUE(favicon_status1.valid);
   EXPECT_FALSE(favicon_status1.image.IsEmpty());
   EXPECT_EQ(gfx::kFaviconSize, favicon_status1.image.Width());
 
   size_t expected_index = 2u;
   EXPECT_EQ(32, kSizes1[expected_index]);
   EXPECT_EQ(kSourceIconURLs[expected_index].icon_url,
             handler1.GetEntry()->GetFavicon().url);
 
   // 2) Test that if there are several single resolution favicons to choose
   // from, the exact match is preferred even if it results in upsampling.
   TestFaviconHandlerDelegate delegate2;
-  TestFaviconHandler handler2(kPageURL, profile,
-                              &delegate2, FaviconHandler::FAVICON);
+  TestFaviconHandler handler2(
+      kPageURL, profile, &driver, &delegate2, FaviconHandler::FAVICON);
   const int kSizes2[] = { 16, 24, 48, 256 };
   std::vector<FaviconURL> urls2(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSizes2));
   DownloadTillDoneIgnoringHistory(&handler2, kPageURL, urls2, kSizes2);
   EXPECT_TRUE(handler2.GetEntry()->GetFavicon().valid);
   expected_index = 0u;
   EXPECT_EQ(16, kSizes2[expected_index]);
   EXPECT_EQ(kSourceIconURLs[expected_index].icon_url,
             handler2.GetEntry()->GetFavicon().url);
 
   // 3) Test that favicons which need to be upsampled a little or downsampled
   // a little are preferred over huge favicons.
   TestFaviconHandlerDelegate delegate3;
-  TestFaviconHandler handler3(kPageURL, profile,
-                              &delegate3, FaviconHandler::FAVICON);
+  TestFaviconHandler handler3(
+      kPageURL, profile, &driver, &delegate3, FaviconHandler::FAVICON);
   const int kSizes3[] = { 256, 48 };
   std::vector<FaviconURL> urls3(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSizes3));
   DownloadTillDoneIgnoringHistory(&handler3, kPageURL, urls3, kSizes3);
   EXPECT_TRUE(handler3.GetEntry()->GetFavicon().valid);
   expected_index = 1u;
   EXPECT_EQ(48, kSizes3[expected_index]);
   EXPECT_EQ(kSourceIconURLs[expected_index].icon_url,
             handler3.GetEntry()->GetFavicon().url);
 
   TestFaviconHandlerDelegate delegate4;
-  TestFaviconHandler handler4(kPageURL, profile,
-                              &delegate4, FaviconHandler::FAVICON);
+  TestFaviconHandler handler4(
+      kPageURL, profile, &driver, &delegate4, FaviconHandler::FAVICON);
   const int kSizes4[] = { 17, 256 };
   std::vector<FaviconURL> urls4(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSizes4));
   DownloadTillDoneIgnoringHistory(&handler4, kPageURL, urls4, kSizes4);
   EXPECT_TRUE(handler4.GetEntry()->GetFavicon().valid);
   expected_index = 0u;
   EXPECT_EQ(17, kSizes4[expected_index]);
   EXPECT_EQ(kSourceIconURLs[expected_index].icon_url,
             handler4.GetEntry()->GetFavicon().url);
 }
@@ skipping 77 matching lines @@
   download_id = favicon_tab_helper->StartDownload(missing_icon_url, 0);
   EXPECT_NE(0, download_id);
   // Report download success with HTTP 200 status.
   favicon_tab_helper->DidDownloadFavicon(download_id, 200, missing_icon_url,
       empty_icons, empty_icon_sizes);
   // Icon is not marked as UnableToDownload as HTTP status is not 404.
   EXPECT_FALSE(favicon_service->WasUnableToDownloadFavicon(missing_icon_url));
 }
 
 }  // namespace.