Move IconURLs method from WebFrame to WebLocalFrame

chrome/browser/extensions/favicon_downloader_unittest.cc

 // Copyright 2013 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 "chrome/browser/extensions/favicon_downloader.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 85 matching lines @@
   FaviconDownloader::FaviconMap favicon_map_;
   int id_counter_;
   DISALLOW_COPY_AND_ASSIGN(TestFaviconDownloader);
 };
 
 TEST_F(FaviconDownloaderTest, SimpleDownload) {
   const GURL favicon_url("http://www.google.com/favicon.ico");
   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());
 
   downloader.Start();
   EXPECT_EQ(1u, downloader.pending_requests());
 
   std::vector<gfx::Size> sizes(1, gfx::Size(32, 32));
   downloader.CompleteImageDownload(0, favicon_urls[0].icon_url, sizes);
   EXPECT_EQ(0u, downloader.pending_requests());
 
   EXPECT_EQ(1u, downloader.favicon_map().size());
   EXPECT_EQ(1u, downloader.favicon_map()[favicon_url].size());
 }
 
 TEST_F(FaviconDownloaderTest, DownloadWithUrlsFromWebContentsNotification) {
   const GURL favicon_url("http://www.google.com/favicon.ico");
   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.
   downloader.Start();
   EXPECT_EQ(0u, downloader.pending_requests());
 
   downloader.UpdateFaviconURLs(favicon_urls);
   EXPECT_EQ(1u, downloader.pending_requests());
 
   std::vector<gfx::Size> sizes(1, gfx::Size(32, 32));
@@ skipping 11 matching lines @@
 
   std::vector<GURL> extra_urls;
   // This should get downloaded.
   extra_urls.push_back(favicon_url_2);
   // This is duplicated in the favicon urls and should only be downloaded once.
   extra_urls.push_back(empty_favicon);
 
   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());
 
   std::vector<gfx::Size> sizes_1(1, gfx::Size(16, 16));
   downloader.CompleteImageDownload(0, favicon_url_1, sizes_1);
 
   std::vector<gfx::Size> sizes_2;
   sizes_2.push_back(gfx::Size(32, 32));
   sizes_2.push_back(gfx::Size(64, 64));
@@ skipping 15 matching lines @@
   const GURL favicon_url_2("http://www.google.com/favicon2.ico");
 
   std::vector<GURL> extra_urls;
   extra_urls.push_back(favicon_url_1);
 
   TestFaviconDownloader downloader(web_contents(), extra_urls);
 
   // 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();
   EXPECT_EQ(1u, downloader.pending_requests());
 
   std::vector<gfx::Size> sizes_1(1, gfx::Size(16, 16));
   downloader.CompleteImageDownload(0, favicon_url_1, sizes_1);
 
   // This download should not be finished and inserted into the map.
   std::vector<gfx::Size> sizes_2;
   sizes_2.push_back(gfx::Size(32, 32));
   sizes_2.push_back(gfx::Size(64, 64));
   downloader.CompleteImageDownload(1, favicon_url_2, sizes_2);
   EXPECT_EQ(0u, downloader.pending_requests());
 
   EXPECT_EQ(1u, downloader.favicon_map().size());
   EXPECT_EQ(1u, downloader.favicon_map()[favicon_url_1].size());
   EXPECT_EQ(0u, downloader.favicon_map()[favicon_url_2].size());
 }