Split FaviconService and FaviconServiceImpl.

components/favicon/core/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 "components/favicon/core/favicon_handler.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "base/macros.h"
 #include "components/favicon/core/favicon_driver.h"
+#include "components/favicon/core/test/mock_favicon_service.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 
 namespace favicon {
 namespace {
 
@@ skipping 236 matching lines @@
 
 // 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:
   static int GetMaximalIconSize(favicon_base::IconType icon_type) {
     return FaviconHandler::GetMaximalIconSize(icon_type);
   }
 
-  TestFaviconHandler(TestFaviconDriver* driver,
+  TestFaviconHandler(FaviconService* service,
+                     TestFaviconDriver* driver,
                      FaviconDriverObserver::NotificationIconType handler_type)
-      : FaviconHandler(nullptr, driver, handler_type),
-        download_id_(0) {
+      : FaviconHandler(service, driver, handler_type), download_id_(0) {
     download_handler_.reset(new DownloadHandler(this));
   }
 
   ~TestFaviconHandler() override {}
 
   HistoryRequestHandler* history_handler() {
     return history_handler_.get();
   }
 
   // This method will take the ownership of the given handler.
@@ skipping 72 matching lines @@
                                            bytes->front() + bytes->size());
     history_handler_.reset(new HistoryRequestHandler(
         page_url, icon_url, icon_type, bitmap_data, image.Size()));
   }
 
   bool ShouldSaveFavicon() override { return true; }
 
   GURL page_url_;
 
  private:
-
   // The unique id of a download request. It will be returned to a
   // FaviconHandler.
   int download_id_;
 
   std::unique_ptr<DownloadHandler> download_handler_;
   std::unique_ptr<HistoryRequestHandler> history_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(TestFaviconHandler);
 };
 
@@ skipping 28 matching lines @@
       original_bitmap_sizes.push_back(gfx::Size(original_size, original_size));
     }
   }
   favicon_handler_->OnDidDownloadFavicon(download_->download_id,
                                          download_->image_url, bitmaps,
                                          original_bitmap_sizes);
   callback_invoked_ = true;
 }
 
 class FaviconHandlerTest : public testing::Test {
- public:
+ protected:
   FaviconHandlerTest() {
   }
 
   ~FaviconHandlerTest() override {}
 
   // Simulates requesting a favicon for |page_url| given:
   // - We have not previously cached anything in history for |page_url| or for
   //   any of |candidates|.
   // - The page provides favicons at |candidate_icons|.
   // - The favicons at |candidate_icons| have edge pixel sizes of
@@ skipping 47 matching lines @@
     // a downloaded bitmap in FaviconHandler::OnDidDownloadFavicon().
     // Force the values of the scale factors so that the tests produce the same
     // results on all platforms.
     std::vector<ui::ScaleFactor> scale_factors;
     scale_factors.push_back(ui::SCALE_FACTOR_100P);
     scoped_set_supported_scale_factors_.reset(
         new ui::test::ScopedSetSupportedScaleFactors(scale_factors));
     testing::Test::SetUp();
   }
 
- private:
   std::unique_ptr<ui::test::ScopedSetSupportedScaleFactors>
       scoped_set_supported_scale_factors_;
+  testing::StrictMock<MockFaviconService> favicon_service_;
+
+ private:
   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");
 
   TestFaviconDriver driver;
-  TestFaviconHandler helper(&driver, FaviconDriverObserver::NON_TOUCH_16_DIP);
+  TestFaviconHandler helper(&favicon_service_, &driver,
+                            FaviconDriverObserver::NON_TOUCH_16_DIP);
 
   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(favicon_base::FAVICON, history_handler->icon_type_);
 
   SetFaviconRawBitmapResult(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");
 
   TestFaviconDriver driver;
-  TestFaviconHandler helper(&driver, FaviconDriverObserver::NON_TOUCH_16_DIP);
+  TestFaviconHandler helper(&favicon_service_, &driver,
+                            FaviconDriverObserver::NON_TOUCH_16_DIP);
 
   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(favicon_base::FAVICON, history_handler->icon_type_);
 
   // Set icon data expired
@@ skipping 46 matching lines @@
   EXPECT_FALSE(driver.image().IsEmpty());
   EXPECT_EQ(gfx::kFaviconSize, driver.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");
 
   TestFaviconDriver driver;
-  TestFaviconHandler helper(&driver, FaviconDriverObserver::NON_TOUCH_16_DIP);
+  TestFaviconHandler helper(&favicon_service_, &driver,
+                            FaviconDriverObserver::NON_TOUCH_16_DIP);
 
   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(favicon_base::FAVICON, history_handler->icon_type_);
 
   // Set valid icon data.
@@ skipping 58 matching lines @@
   EXPECT_EQ(new_icon_url, driver.icon_url());
   EXPECT_FALSE(driver.image().IsEmpty());
   EXPECT_EQ(gfx::kFaviconSize, driver.image().Width());
 }
 
 TEST_F(FaviconHandlerTest, FaviconInHistoryInvalid) {
   const GURL page_url("http://www.google.com");
   const GURL icon_url("http://www.google.com/favicon");
 
   TestFaviconDriver driver;
-  TestFaviconHandler helper(&driver, FaviconDriverObserver::NON_TOUCH_16_DIP);
+  TestFaviconHandler helper(&favicon_service_, &driver,
+                            FaviconDriverObserver::NON_TOUCH_16_DIP);
 
   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(favicon_base::FAVICON, history_handler->icon_type_);
 
   // Set non empty but invalid data.
@@ skipping 49 matching lines @@
   EXPECT_FALSE(driver.image().IsEmpty());
   EXPECT_EQ(gfx::kFaviconSize, driver.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");
 
   TestFaviconDriver driver;
-  TestFaviconHandler helper(&driver, FaviconDriverObserver::NON_TOUCH_16_DIP);
+  TestFaviconHandler helper(&favicon_service_, &driver,
+                            FaviconDriverObserver::NON_TOUCH_16_DIP);
 
   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(favicon_base::FAVICON, history_handler->icon_type_);
 
   SetFaviconRawBitmapResult(icon_url, &history_handler->history_results_);
@@ skipping 39 matching lines @@
   EXPECT_EQ(new_icon_url, driver.icon_url());
   EXPECT_FALSE(driver.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");
 
   TestFaviconDriver driver;
-  TestFaviconHandler helper(&driver, FaviconDriverObserver::TOUCH_LARGEST);
+  TestFaviconHandler helper(&favicon_service_, &driver,
+                            FaviconDriverObserver::TOUCH_LARGEST);
   std::set<GURL> fail_downloads;
   fail_downloads.insert(icon_url);
   helper.download_handler()->FailDownloadForIconURLs(fail_downloads);
 
   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_);
@@ skipping 94 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");
 
   TestFaviconDriver driver;
-  TestFaviconHandler helper(&driver, FaviconDriverObserver::TOUCH_LARGEST);
+  TestFaviconHandler helper(&favicon_service_, &driver,
+                            FaviconDriverObserver::TOUCH_LARGEST);
 
   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(favicon_base::TOUCH_PRECOMPOSED_ICON | favicon_base::TOUCH_ICON,
             history_handler->icon_type_);
 
@@ skipping 101 matching lines @@
   const GURL icon_url2("http://www.google.com/favicon2");
   std::vector<FaviconURL> favicon_urls;
   favicon_urls.push_back(FaviconURL(GURL("http://www.google.com/favicon1"),
                                     favicon_base::FAVICON,
                                     std::vector<gfx::Size>()));
   favicon_urls.push_back(FaviconURL(GURL("http://www.google.com/favicon2"),
                                     favicon_base::FAVICON,
                                     std::vector<gfx::Size>()));
 
   TestFaviconDriver driver;
-  TestFaviconHandler helper(&driver, FaviconDriverObserver::NON_TOUCH_16_DIP);
+  TestFaviconHandler helper(&favicon_service_, &driver,
+                            FaviconDriverObserver::NON_TOUCH_16_DIP);
 
   // Initiate a request for favicon data for |page_url|. History does not know
   // about the page URL or the icon URLs.
   helper.FetchFavicon(page_url);
   helper.history_handler()->InvokeCallback();
   helper.set_history_handler(nullptr);
 
   // Got icon URLs.
   helper.OnUpdateFaviconURL(page_url, favicon_urls);
 
@@ skipping 25 matching lines @@
 }
 
 // Fixes crbug.com/544560
 TEST_F(FaviconHandlerTest,
        OnFaviconAvailableNotificationSentAfterIconURLChange) {
   const GURL kPageURL("http://www.page_which_animates_favicon.com");
   const GURL kIconURL1("http://wwww.page_which_animates_favicon.com/frame1.png");
   const GURL kIconURL2("http://wwww.page_which_animates_favicon.com/frame2.png");
 
   TestFaviconDriver driver;
-  TestFaviconHandler helper(&driver, FaviconDriverObserver::NON_TOUCH_16_DIP);
+  TestFaviconHandler helper(&favicon_service_, &driver,
+                            FaviconDriverObserver::NON_TOUCH_16_DIP);
 
   // Initial state:
   // - The database does not know about |kPageURL|.
   // - The page uses |kIconURL1| and |kIconURL2|.
   // - The database knows about both |kIconURL1| and |kIconURl2|. Both icons
   //   are expired in the database.
   helper.FetchFavicon(kPageURL);
   ASSERT_TRUE(helper.history_handler());
   helper.history_handler()->InvokeCallback();
   {
@@ skipping 92 matching lines @@
   // Set the supported scale factors to 1x and 2x. This affects the behavior of
   // SelectFaviconFrames().
   std::vector<ui::ScaleFactor> scale_factors;
   scale_factors.push_back(ui::SCALE_FACTOR_100P);
   scale_factors.push_back(ui::SCALE_FACTOR_200P);
   ui::test::ScopedSetSupportedScaleFactors scoped_supported(scale_factors);
 
   // 1) Test that if there are several single resolution favicons to choose from
   // that the largest exact match is chosen.
   TestFaviconDriver driver1;
-  TestFaviconHandler handler1(&driver1,
+  TestFaviconHandler handler1(&favicon_service_, &driver1,
                               FaviconDriverObserver::NON_TOUCH_16_DIP);
 
   const int kSizes1[] = { 16, 24, 32, 48, 256 };
   std::vector<FaviconURL> urls1(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSizes1));
   DownloadTillDoneIgnoringHistory(
       &driver1, &handler1, kPageURL, urls1, kSizes1);
 
   EXPECT_EQ(nullptr, handler1.current_candidate());
   EXPECT_EQ(1u, driver1.num_notifications());
   EXPECT_FALSE(driver1.image().IsEmpty());
   EXPECT_EQ(gfx::kFaviconSize, driver1.image().Width());
 
   size_t expected_index = 2u;
   EXPECT_EQ(32, kSizes1[expected_index]);
   EXPECT_EQ(kSourceIconURLs[expected_index].icon_url, driver1.icon_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.
   TestFaviconDriver driver2;
-  TestFaviconHandler handler2(&driver2,
+  TestFaviconHandler handler2(&favicon_service_, &driver2,
                               FaviconDriverObserver::NON_TOUCH_16_DIP);
 
   const int kSizes2[] = { 16, 24, 48, 256 };
   std::vector<FaviconURL> urls2(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSizes2));
   DownloadTillDoneIgnoringHistory(
       &driver2, &handler2, kPageURL, urls2, kSizes2);
   EXPECT_EQ(1u, driver2.num_notifications());
   expected_index = 0u;
   EXPECT_EQ(16, kSizes2[expected_index]);
   EXPECT_EQ(kSourceIconURLs[expected_index].icon_url, driver2.icon_url());
 
   // 3) Test that favicons which need to be upsampled a little or downsampled
   // a little are preferred over huge favicons.
   TestFaviconDriver driver3;
-  TestFaviconHandler handler3(&driver3,
+  TestFaviconHandler handler3(&favicon_service_, &driver3,
                               FaviconDriverObserver::NON_TOUCH_16_DIP);
 
   const int kSizes3[] = { 256, 48 };
   std::vector<FaviconURL> urls3(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSizes3));
   DownloadTillDoneIgnoringHistory(
       &driver3, &handler3, kPageURL, urls3, kSizes3);
   EXPECT_EQ(1u, driver3.num_notifications());
   expected_index = 1u;
   EXPECT_EQ(48, kSizes3[expected_index]);
   EXPECT_EQ(kSourceIconURLs[expected_index].icon_url, driver3.icon_url());
 
   TestFaviconDriver driver4;
-  TestFaviconHandler handler4(&driver4,
+  TestFaviconHandler handler4(&favicon_service_, &driver4,
                               FaviconDriverObserver::NON_TOUCH_16_DIP);
 
   const int kSizes4[] = { 17, 256 };
   std::vector<FaviconURL> urls4(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSizes4));
   DownloadTillDoneIgnoringHistory(
       &driver4, &handler4, kPageURL, urls4, kSizes4);
   EXPECT_EQ(1u, driver4.num_notifications());
   expected_index = 0u;
   EXPECT_EQ(17, kSizes4[expected_index]);
@@ skipping 13 matching lines @@
       FaviconURL(GURL("http://www.google.com/a"),
                  favicon_base::FAVICON,
                  std::vector<gfx::Size>()),
       k404FaviconURL,
       FaviconURL(GURL("http://www.google.com/c"),
                  favicon_base::FAVICON,
                  std::vector<gfx::Size>()),
   };
 
   TestFaviconDriver driver;
-  TestFaviconHandler handler(&driver, FaviconDriverObserver::NON_TOUCH_16_DIP);
+  TestFaviconHandler handler(&favicon_service_, &driver,
+                             FaviconDriverObserver::NON_TOUCH_16_DIP);
   DownloadHandler* download_handler = handler.download_handler();
 
   std::set<GURL> k404URLs;
   k404URLs.insert(k404IconURL);
   download_handler->FailDownloadForIconURLs(k404URLs);
 
   // Make the initial download for |k404IconURL| fail.
   const int kSizes1[] = { 0 };
   std::vector<FaviconURL> urls1(1u, k404FaviconURL);
   DownloadTillDoneIgnoringHistory(
@@ skipping 28 matching lines @@
   const FaviconURL kFaviconURLs[] = {
       FaviconURL(k404IconURL1,
                  favicon_base::FAVICON,
                  std::vector<gfx::Size>()),
       FaviconURL(k404IconURL2,
                  favicon_base::FAVICON,
                  std::vector<gfx::Size>()),
   };
 
   TestFaviconDriver driver;
-  TestFaviconHandler handler(&driver, FaviconDriverObserver::NON_TOUCH_16_DIP);
+  TestFaviconHandler handler(&favicon_service_, &driver,
+                             FaviconDriverObserver::NON_TOUCH_16_DIP);
   DownloadHandler* download_handler = handler.download_handler();
 
   std::set<GURL> k404URLs;
   k404URLs.insert(k404IconURL1);
   k404URLs.insert(k404IconURL2);
   download_handler->FailDownloadForIconURLs(k404URLs);
 
   // Make the initial downloads for |kFaviconURLs| fail.
   for (const FaviconURL& favicon_url : kFaviconURLs) {
     const int kSizes[] = { 0 };
@@ skipping 20 matching lines @@
 // URL syntax.
 TEST_F(FaviconHandlerTest, FaviconInvalidURL) {
   const GURL kPageURL("http://www.google.com");
   const GURL kInvalidFormatURL("invalid");
   ASSERT_TRUE(kInvalidFormatURL.is_empty());
 
   FaviconURL favicon_url(kInvalidFormatURL, favicon_base::FAVICON,
                          std::vector<gfx::Size>());
 
   TestFaviconDriver driver;
-  TestFaviconHandler handler(&driver, FaviconDriverObserver::NON_TOUCH_16_DIP);
+  TestFaviconHandler handler(&favicon_service_, &driver,
+                             FaviconDriverObserver::NON_TOUCH_16_DIP);
   UpdateFaviconURL(&driver, &handler, kPageURL,
                    std::vector<FaviconURL>(1u, favicon_url));
   EXPECT_EQ(0u, handler.image_urls().size());
 }
 
 TEST_F(FaviconHandlerTest, TestSortFavicon) {
   const GURL kPageURL("http://www.google.com");
   std::vector<gfx::Size> icon1;
   icon1.push_back(gfx::Size(1024, 1024));
   icon1.push_back(gfx::Size(512, 512));
@@ skipping 11 matching lines @@
       FaviconURL(GURL("http://www.google.com/b"), favicon_base::FAVICON, icon2),
       FaviconURL(GURL("http://www.google.com/c"), favicon_base::FAVICON, icon3),
       FaviconURL(GURL("http://www.google.com/d"),
                  favicon_base::FAVICON,
                  std::vector<gfx::Size>()),
       FaviconURL(GURL("http://www.google.com/e"),
                  favicon_base::FAVICON,
                  std::vector<gfx::Size>())};
 
   TestFaviconDriver driver1;
-  TestFaviconHandler handler1(&driver1,
+  TestFaviconHandler handler1(&favicon_service_, &driver1,
                               FaviconDriverObserver::NON_TOUCH_LARGEST);
   std::vector<FaviconURL> urls1(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSourceIconURLs));
   UpdateFaviconURL(&driver1, &handler1, kPageURL, urls1);
 
   struct ExpectedResult {
     // The favicon's index in kSourceIconURLs.
     size_t favicon_index;
     // Width of largest bitmap.
     int width;
@@ skipping 42 matching lines @@
       FaviconURL(
           GURL("http://www.google.com/c"), favicon_base::FAVICON, icon3),
       FaviconURL(GURL("http://www.google.com/d"),
                  favicon_base::FAVICON,
                  std::vector<gfx::Size>()),
       FaviconURL(GURL("http://www.google.com/e"),
                  favicon_base::FAVICON,
                  std::vector<gfx::Size>())};
 
   TestFaviconDriver driver1;
-  TestFaviconHandler handler1(&driver1,
+  TestFaviconHandler handler1(&favicon_service_, &driver1,
                               FaviconDriverObserver::NON_TOUCH_LARGEST);
 
   std::set<GURL> fail_icon_urls;
   for (size_t i = 0; i < arraysize(kSourceIconURLs); ++i) {
     fail_icon_urls.insert(kSourceIconURLs[i].icon_url);
   }
   handler1.download_handler()->FailDownloadForIconURLs(fail_icon_urls);
 
   std::vector<FaviconURL> urls1(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSourceIconURLs));
@@ skipping 47 matching lines @@
   two_icons.push_back(gfx::Size(14, 14));
   two_icons.push_back(gfx::Size(16, 16));
 
   const FaviconURL kSourceIconURLs[] = {
       FaviconURL(
           GURL("http://www.google.com/b"), favicon_base::FAVICON, one_icon),
       FaviconURL(
           GURL("http://www.google.com/c"), favicon_base::FAVICON, two_icons)};
 
   TestFaviconDriver driver1;
-  TestFaviconHandler handler1(&driver1,
+  TestFaviconHandler handler1(&favicon_service_, &driver1,
                               FaviconDriverObserver::NON_TOUCH_LARGEST);
   std::vector<FaviconURL> urls1(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSourceIconURLs));
   UpdateFaviconURL(&driver1, &handler1, kPageURL, urls1);
 
   ASSERT_EQ(2u, handler1.image_urls().size());
 
   // Index of largest favicon in kSourceIconURLs.
   size_t i = 1;
   // The largest bitmap's index in Favicon .
@@ skipping 45 matching lines @@
   std::vector<gfx::Size> icon2;
   icon2.push_back(gfx::Size(kMaximalSize + 2, kMaximalSize + 2));
 
   const FaviconURL kSourceIconURLs[] = {
       FaviconURL(
           GURL("http://www.google.com/b"), favicon_base::FAVICON, icon1),
       FaviconURL(
           GURL("http://www.google.com/c"), favicon_base::FAVICON, icon2)};
 
   TestFaviconDriver driver1;
-  TestFaviconHandler handler1(&driver1,
+  TestFaviconHandler handler1(&favicon_service_, &driver1,
                               FaviconDriverObserver::NON_TOUCH_LARGEST);
   std::vector<FaviconURL> urls1(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSourceIconURLs));
   UpdateFaviconURL(&driver1, &handler1, kPageURL, urls1);
 
   ASSERT_EQ(2u, handler1.image_urls().size());
 
   // Index of largest favicon in kSourceIconURLs.
   size_t i = 1;
   // The largest bitmap's index in Favicon .
@@ skipping 40 matching lines @@
   const int actual_size2 = 12;
 
   const FaviconURL kSourceIconURLs[] = {
       FaviconURL(GURL("http://www.google.com/b"), favicon_base::FAVICON, icon1),
       FaviconURL(GURL("http://www.google.com/c"), favicon_base::FAVICON, icon2),
       FaviconURL(GURL("http://www.google.com/d"),
                  favicon_base::FAVICON,
                  std::vector<gfx::Size>())};
 
   TestFaviconDriver driver1;
-  TestFaviconHandler handler1(&driver1,
+  TestFaviconHandler handler1(&favicon_service_, &driver1,
                               FaviconDriverObserver::NON_TOUCH_LARGEST);
   std::vector<FaviconURL> urls1(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSourceIconURLs));
   UpdateFaviconURL(&driver1, &handler1, kPageURL, urls1);
   ASSERT_EQ(3u, handler1.image_urls().size());
 
   // Simulate no favicon from history.
   handler1.history_handler()->history_results_.clear();
   handler1.history_handler()->InvokeCallback();
 
@@ skipping 32 matching lines @@
   handler1.download_handler()->Reset();
 
   // Verify icon2 has been saved into history.
   EXPECT_EQ(kSourceIconURLs[1].icon_url, handler1.history_handler()->icon_url_);
   EXPECT_EQ(gfx::Size(actual_size2, actual_size2),
             handler1.history_handler()->size_);
 }
 
 }  // namespace
 }  // namespace favicon