Move IconURLs method from WebFrame to WebLocalFrame

components/favicon/content/content_favicon_driver_unittest.cc

 // Copyright 2015 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/content/content_favicon_driver.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 60 matching lines @@
 
   testing::NiceMock<MockFaviconService> favicon_service_;
 };
 
 // Test that a download is initiated when there isn't a favicon in the database
 // for either the page URL or the icon URL.
 TEST_F(ContentFaviconDriverTest, ShouldCauseImageDownload) {
   // Mimic a page load.
   TestFetchFaviconForPage(
       kPageURL,
-      {content::FaviconURL(kIconURL, content::FaviconURL::FAVICON,
+      {content::FaviconURL(kIconURL, content::FaviconURL::IconType::kFavicon,
                            kEmptyIconSizes)});
   EXPECT_TRUE(web_contents_tester()->TestDidDownloadImage(
       kIconURL, 200, kEmptyIcons, kEmptyIconSizes));
 }
 
 // Test that Favicon is not requested repeatedly during the same session if
 // the favicon is known to be unavailable (e.g. due to HTTP 404 status).
 TEST_F(ContentFaviconDriverTest, ShouldNotRequestRepeatedlyIfUnavailable) {
   ON_CALL(favicon_service_, WasUnableToDownloadFavicon(kIconURL))
       .WillByDefault(Return(true));
   // Mimic a page load.
   TestFetchFaviconForPage(
       kPageURL,
-      {content::FaviconURL(kIconURL, content::FaviconURL::FAVICON,
+      {content::FaviconURL(kIconURL, content::FaviconURL::IconType::kFavicon,
                            kEmptyIconSizes)});
   // Verify that no download request is pending for the image.
   EXPECT_FALSE(web_contents_tester()->HasPendingDownloadImage(kIconURL));
 }
 
 TEST_F(ContentFaviconDriverTest, ShouldDownloadSecondIfFirstUnavailable) {
   const GURL kOtherIconURL = GURL("http://www.google.com/other-favicon.ico");
   ON_CALL(favicon_service_, WasUnableToDownloadFavicon(kIconURL))
       .WillByDefault(Return(true));
   // Mimic a page load.
   TestFetchFaviconForPage(
       kPageURL,
-      {content::FaviconURL(kIconURL, content::FaviconURL::FAVICON,
+      {content::FaviconURL(kIconURL, content::FaviconURL::IconType::kFavicon,
                            kEmptyIconSizes),
-       content::FaviconURL(kOtherIconURL, content::FaviconURL::FAVICON,
+       content::FaviconURL(kOtherIconURL,
+                           content::FaviconURL::IconType::kFavicon,
                            kEmptyIconSizes)});
   // Verify a  download request is pending for the second image.
   EXPECT_FALSE(web_contents_tester()->HasPendingDownloadImage(kIconURL));
   EXPECT_TRUE(web_contents_tester()->HasPendingDownloadImage(kOtherIconURL));
 }
 
 // Test that ContentFaviconDriver ignores updated favicon URLs if there is no
 // last committed entry. This occurs when script is injected in about:blank.
 // See crbug.com/520759 for more details
 TEST_F(ContentFaviconDriverTest, FaviconUpdateNoLastCommittedEntry) {
   ASSERT_EQ(nullptr, web_contents()->GetController().GetLastCommittedEntry());
 
   std::vector<content::FaviconURL> favicon_urls;
-  favicon_urls.push_back(
-      content::FaviconURL(GURL("http://www.google.ca/favicon.ico"),
-                          content::FaviconURL::FAVICON, kEmptyIconSizes));
+  favicon_urls.push_back(content::FaviconURL(
+      GURL("http://www.google.ca/favicon.ico"),
+      content::FaviconURL::IconType::kFavicon, kEmptyIconSizes));
   favicon::ContentFaviconDriver* driver =
       favicon::ContentFaviconDriver::FromWebContents(web_contents());
   static_cast<content::WebContentsObserver*>(driver)
       ->DidUpdateFaviconURL(favicon_urls);
 
   // Test that ContentFaviconDriver ignored the favicon url update.
   EXPECT_TRUE(driver->favicon_urls().empty());
 }
 
 TEST_F(ContentFaviconDriverTest, RecordsHistorgramsForCandidates) {
   const std::vector<gfx::Size> kSizes16x16and32x32({{16, 16}, {32, 32}});
   base::HistogramTester tester;
   content::WebContentsObserver* driver_as_observer =
       ContentFaviconDriver::FromWebContents(web_contents());
 
   // Navigation to a page updating one icon.
   NavigateAndCommit(GURL("http://www.youtube.com"));
-  driver_as_observer->DidUpdateFaviconURL(
-      {content::FaviconURL(GURL("http://www.youtube.com/favicon.ico"),
-                           content::FaviconURL::FAVICON, kSizes16x16and32x32)});
+  driver_as_observer->DidUpdateFaviconURL({content::FaviconURL(
+      GURL("http://www.youtube.com/favicon.ico"),
+      content::FaviconURL::IconType::kFavicon, kSizes16x16and32x32)});
 
   EXPECT_THAT(tester.GetAllSamples("Favicons.CandidatesCount"),
               ElementsAre(base::Bucket(/*min=*/1, /*count=*/1)));
   EXPECT_THAT(tester.GetAllSamples("Favicons.CandidatesWithDefinedSizesCount"),
               ElementsAre(base::Bucket(/*min=*/1, /*count=*/1)));
   EXPECT_THAT(tester.GetAllSamples("Favicons.CandidatesWithTouchIconsCount"),
               ElementsAre(base::Bucket(/*min=*/0, /*count=*/1)));
 
   std::vector<content::FaviconURL> favicon_urls = {
       content::FaviconURL(GURL("http://www.google.ca/favicon.ico"),
-                          content::FaviconURL::FAVICON, kSizes16x16and32x32),
+                          content::FaviconURL::IconType::kFavicon,
+                          kSizes16x16and32x32),
       content::FaviconURL(GURL("http://www.google.ca/precomposed_icon.png"),
-                          content::FaviconURL::TOUCH_PRECOMPOSED_ICON,
+                          content::FaviconURL::IconType::kTouchPrecomposedIcon,
                           kEmptyIconSizes),
       content::FaviconURL(GURL("http://www.google.ca/touch_icon.png"),
-                          content::FaviconURL::TOUCH_ICON, kEmptyIconSizes)};
+                          content::FaviconURL::IconType::kTouchIcon,
+                          kEmptyIconSizes)};
 
   // Double navigation to a page with 3 different icons.
   NavigateAndCommit(GURL("http://www.google.ca"));
   driver_as_observer->DidUpdateFaviconURL(favicon_urls);
   NavigateAndCommit(GURL("http://www.google.ca"));
   driver_as_observer->DidUpdateFaviconURL(favicon_urls);
 
   EXPECT_THAT(tester.GetAllSamples("Favicons.CandidatesCount"),
               ElementsAre(base::Bucket(/*min=*/1, /*count=*/1),
                           base::Bucket(/*min=*/3, /*count=*/2)));
   EXPECT_THAT(tester.GetAllSamples("Favicons.CandidatesWithDefinedSizesCount"),
               ElementsAre(base::Bucket(/*min=*/1, /*count=*/3)));
   EXPECT_THAT(tester.GetAllSamples("Favicons.CandidatesWithTouchIconsCount"),
               ElementsAre(base::Bucket(/*min=*/0, /*count=*/1),
                           base::Bucket(/*min=*/2, /*count=*/2)));
 }
 
 }  // namespace
 }  // namespace favicon