Move IconURLs method from WebFrame to WebLocalFrame

chrome/browser/extensions/favicon_downloader_unittest.cc

Index: chrome/browser/extensions/favicon_downloader_unittest.cc
diff --git a/chrome/browser/extensions/favicon_downloader_unittest.cc b/chrome/browser/extensions/favicon_downloader_unittest.cc
index 1a0fb628a22e3004e8c571e3b62743f3cd1d9757..2c7d0140bb78b78ab4bd2069b48ff04776667a65 100644
--- a/chrome/browser/extensions/favicon_downloader_unittest.cc
+++ b/chrome/browser/extensions/favicon_downloader_unittest.cc
@@ -103,8 +103,9 @@ TEST_F(FaviconDownloaderTest, SimpleDownload) {
   TestFaviconDownloader downloader(web_contents(), std::vector<GURL>());
 
   std::vector<content::FaviconURL> favicon_urls;
-  favicon_urls.push_back(content::FaviconURL(
-      favicon_url, content::FaviconURL::FAVICON, std::vector<gfx::Size>()));
+  favicon_urls.push_back(
+      content::FaviconURL(favicon_url, content::FaviconURL::IconType::kFavicon,
+                          std::vector<gfx::Size>()));
   downloader.set_initial_favicon_urls(favicon_urls);
   EXPECT_EQ(0u, downloader.pending_requests());
 
@@ -124,8 +125,9 @@ TEST_F(FaviconDownloaderTest, DownloadWithUrlsFromWebContentsNotification) {
   TestFaviconDownloader downloader(web_contents(), std::vector<GURL>());
 
   std::vector<content::FaviconURL> favicon_urls;
-  favicon_urls.push_back(content::FaviconURL(
-      favicon_url, content::FaviconURL::FAVICON, std::vector<gfx::Size>()));
+  favicon_urls.push_back(
+      content::FaviconURL(favicon_url, content::FaviconURL::IconType::kFavicon,
+                          std::vector<gfx::Size>()));
   EXPECT_EQ(0u, downloader.pending_requests());
 
   // Start downloader before favicon URLs are loaded.
@@ -157,15 +159,16 @@ TEST_F(FaviconDownloaderTest, DownloadMultipleUrls) {
   TestFaviconDownloader downloader(web_contents(), extra_urls);
   std::vector<content::FaviconURL> favicon_urls;
   favicon_urls.push_back(content::FaviconURL(
-      favicon_url_1, content::FaviconURL::FAVICON, std::vector<gfx::Size>()));
+      favicon_url_1, content::FaviconURL::IconType::kFavicon,
+      std::vector<gfx::Size>()));
   // This is duplicated in the favicon urls and should only be downloaded once.
   favicon_urls.push_back(content::FaviconURL(
-      empty_favicon, content::FaviconURL::FAVICON, std::vector<gfx::Size>()));
+      empty_favicon, content::FaviconURL::IconType::kFavicon,
+      std::vector<gfx::Size>()));
   // Invalid icons shouldn't get put into the download queue.
-  favicon_urls.push_back(
-      content::FaviconURL(GURL("http://www.google.com/invalid.ico"),
-                          content::FaviconURL::INVALID_ICON,
-                          std::vector<gfx::Size>()));
+  favicon_urls.push_back(content::FaviconURL(
+      GURL("http://www.google.com/invalid.ico"),
+      content::FaviconURL::IconType::kInvalid, std::vector<gfx::Size>()));
   downloader.set_initial_favicon_urls(favicon_urls);
   downloader.Start();
   EXPECT_EQ(3u, downloader.pending_requests());
@@ -201,7 +204,8 @@ TEST_F(FaviconDownloaderTest, SkipPageFavicons) {
   // This favicon URL should be ignored.
   std::vector<content::FaviconURL> favicon_urls;
   favicon_urls.push_back(content::FaviconURL(
-      favicon_url_2, content::FaviconURL::FAVICON, std::vector<gfx::Size>()));
+      favicon_url_2, content::FaviconURL::IconType::kFavicon,
+      std::vector<gfx::Size>()));
   downloader.set_initial_favicon_urls(favicon_urls);
   downloader.SkipPageFavicons();
   downloader.Start();