Save large icons to a new LARGE_ICON type

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<set>
 #include<vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 288 matching lines @@
   bool update_active_favicon_;
 
   DISALLOW_COPY_AND_ASSIGN(TestFaviconDriver);
 };
 
 // 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);
-  }
+  using FaviconHandler::GetMaximalIconSize;
 
   TestFaviconHandler(const GURL& page_url,
                      TestFaviconDriver* driver,
                      Type type,
                      bool download_largest_icon)
       : FaviconHandler(nullptr, driver, type, download_largest_icon),
         download_id_(0) {
     driver->SetActiveURL(page_url);
     download_handler_.reset(new DownloadHandler(this));
   }
@@ skipping 1172 matching lines @@
             handler1.history_handler()->size_);
   // Verify NotifyFaviconAvailable().
   EXPECT_FALSE(driver1.update_active_favicon());
   EXPECT_EQ(kSourceIconURLs[i].icon_url, driver1.available_icon_url());
   EXPECT_EQ(kSourceIconURLs[i].icon_sizes[b],
             driver1.available_favicon().Size());
 }
 
 TEST_F(FaviconHandlerTest, TestFaviconWasScaledAfterDownload) {
   const GURL kPageURL("http://www.google.com");
-  const int kMaximalSize =
-    TestFaviconHandler::GetMaximalIconSize(favicon_base::FAVICON);
+
+  TestFaviconDriver driver1;
+  TestFaviconHandler handler1(kPageURL, &driver1, FaviconHandler::FAVICON,
+                              true);
+  const int kMaximalSize = handler1.GetMaximalIconSize(favicon_base::FAVICON);
 
   std::vector<gfx::Size> icon1;
   icon1.push_back(gfx::Size(kMaximalSize + 1, kMaximalSize + 1));
 
   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(kPageURL, &driver1, FaviconHandler::FAVICON,
-                              true);
   std::vector<FaviconURL> urls1(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSourceIconURLs));
   UpdateFaviconURL(&driver1, &handler1, kPageURL, urls1);
 
   ASSERT_EQ(2u, handler1.urls().size());
 
   // Index of largest favicon in kSourceIconURLs.
   size_t i = 1;
   // The largest bitmap's index in Favicon .
   int b = 0;
@@ skipping 173 matching lines @@
   EXPECT_FALSE(driver1.update_active_favicon());
   EXPECT_EQ(3u, driver1.num_favicon_available());
 }
 
 INSTANTIATE_TEST_CASE_P(FaviconHandlerTestActiveFaviconValidityTrueOrFalse,
                         FaviconHandlerActiveFaviconValidityParamTest,
                         ::testing::Bool());
 
 }  // namespace
 }  // namespace favicon