Replace content's faviconURL with components/favicon's

chrome/browser/favicon/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 "base/memory/scoped_ptr.h"
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 
 class TestFaviconHandler;
 
-using content::FaviconURL;
+using favicon::FaviconURL;
 
 namespace {
 
 // Fill the given bmp with valid png data.
 void FillDataToBitmap(int w, int h, SkBitmap* bmp) {
   bmp->setConfig(SkBitmap::kARGB_8888_Config, w, h);
   bmp->allocPixels();
 
   unsigned char* src_data =
       reinterpret_cast<unsigned char*>(bmp->getAddr32(0, 0));
@@ skipping 467 matching lines @@
 
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status
   EXPECT_TRUE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
 
   // Simulates update favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(
-      FaviconURL(icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
+      FaviconURL(icon_url, favicon_base::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(icon_url, helper.current_candidate()->icon_url);
-  ASSERT_EQ(FaviconURL::FAVICON, helper.current_candidate()->icon_type);
+  ASSERT_EQ(favicon_base::FAVICON, helper.current_candidate()->icon_type);
 
   // 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;
@@ skipping 16 matching lines @@
                          &history_handler->history_results_);
   // Send history response.
   history_handler->InvokeCallback();
   // Verify FaviconHandler status
   EXPECT_TRUE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
 
   // Simulates update favicon url.
   std::vector<FaviconURL> urls;
   urls.push_back(
-      FaviconURL(icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
+      FaviconURL(icon_url, favicon_base::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(icon_url, helper.current_candidate()->icon_url);
-  ASSERT_EQ(FaviconURL::FAVICON, helper.current_candidate()->icon_type);
+  ASSERT_EQ(favicon_base::FAVICON, helper.current_candidate()->icon_type);
 
   // Favicon should request to download icon now.
   DownloadHandler* download_handler = helper.download_handler();
   EXPECT_TRUE(helper.download_handler()->HasDownload());
 
   // Verify the download request.
   EXPECT_EQ(icon_url, download_handler->GetImageUrl());
 
   // Reset the history_handler to verify whether favicon is set.
   helper.set_history_handler(NULL);
 
   // Smulates download done.
   download_handler->InvokeCallback();
 
   // New icon should be saved to history backend and navigation entry.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(icon_url, history_handler->icon_url_);
-  EXPECT_EQ(FaviconURL::FAVICON, history_handler->icon_type_);
+  EXPECT_EQ(favicon_base::FAVICON, history_handler->icon_type_);
   EXPECT_LT(0U, history_handler->bitmap_data_.size());
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Verify NavigationEntry.
   EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
   EXPECT_TRUE(driver.GetActiveFaviconValidity());
   EXPECT_FALSE(driver.GetActiveFaviconImage().IsEmpty());
   EXPECT_EQ(gfx::kFaviconSize, driver.GetActiveFaviconImage().Width());
 }
 
@@ skipping 23 matching lines @@
   // Verify FaviconHandler status.
   EXPECT_TRUE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
-  urls.push_back(
-      FaviconURL(new_icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
+  urls.push_back(FaviconURL(
+      new_icon_url, favicon_base::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status.
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(new_icon_url, helper.current_candidate()->icon_url);
-  ASSERT_EQ(FaviconURL::FAVICON, helper.current_candidate()->icon_type);
+  ASSERT_EQ(favicon_base::FAVICON, helper.current_candidate()->icon_type);
 
   // Favicon should be requested from history.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(new_icon_url, history_handler->icon_url_);
-  EXPECT_EQ(FaviconURL::FAVICON, history_handler->icon_type_);
+  EXPECT_EQ(favicon_base::FAVICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Simulate not find icon.
   history_handler->history_results_.clear();
   history_handler->InvokeCallback();
 
   // Favicon should request to download icon now.
   DownloadHandler* download_handler = helper.download_handler();
   EXPECT_TRUE(helper.download_handler()->HasDownload());
 
   // Verify the download request.
   EXPECT_EQ(new_icon_url, download_handler->GetImageUrl());
 
   // Reset the history_handler to verify whether favicon is set.
   helper.set_history_handler(NULL);
 
   // Smulates download done.
   download_handler->InvokeCallback();
 
   // New icon should be saved to history backend and navigation entry.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(new_icon_url, history_handler->icon_url_);
-  EXPECT_EQ(FaviconURL::FAVICON, history_handler->icon_type_);
+  EXPECT_EQ(favicon_base::FAVICON, history_handler->icon_type_);
   EXPECT_LT(0U, history_handler->bitmap_data_.size());
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Verify NavigationEntry.
   EXPECT_EQ(new_icon_url, driver.GetActiveFaviconURL());
   EXPECT_TRUE(driver.GetActiveFaviconValidity());
   EXPECT_FALSE(driver.GetActiveFaviconImage().IsEmpty());
   EXPECT_EQ(gfx::kFaviconSize, driver.GetActiveFaviconImage().Width());
 }
 
@@ skipping 31 matching lines @@
   EXPECT_FALSE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(GURL(), driver.GetActiveFaviconURL());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
 
   // Simulates update with matching favicon URL.
   std::vector<FaviconURL> urls;
   urls.push_back(
-      FaviconURL(icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
+      FaviconURL(icon_url, favicon_base::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
 
   // A download for the favicon should be requested, and we should not do
   // another history request.
   DownloadHandler* download_handler = helper.download_handler();
   EXPECT_TRUE(helper.download_handler()->HasDownload());
   EXPECT_EQ(NULL, helper.history_handler());
 
   // Verify the download request.
   EXPECT_EQ(icon_url, download_handler->GetImageUrl());
 
   // Simulates download done.
   download_handler->InvokeCallback();
 
   // New icon should be saved to history backend and navigation entry.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(icon_url, history_handler->icon_url_);
-  EXPECT_EQ(FaviconURL::FAVICON, history_handler->icon_type_);
+  EXPECT_EQ(favicon_base::FAVICON, history_handler->icon_type_);
   EXPECT_LT(0U, history_handler->bitmap_data_.size());
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Verify NavigationEntry.
   EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
   EXPECT_TRUE(driver.GetActiveFaviconValidity());
   EXPECT_FALSE(driver.GetActiveFaviconImage().IsEmpty());
   EXPECT_EQ(gfx::kFaviconSize, driver.GetActiveFaviconImage().Width());
 }
 
@@ skipping 22 matching lines @@
   // Verify FaviconHandler status.
   EXPECT_TRUE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(icon_url, driver.GetActiveFaviconURL());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
-  urls.push_back(
-      FaviconURL(new_icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
+  urls.push_back(FaviconURL(
+      new_icon_url, favicon_base::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status.
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(new_icon_url, helper.current_candidate()->icon_url);
-  ASSERT_EQ(FaviconURL::FAVICON, helper.current_candidate()->icon_type);
+  ASSERT_EQ(favicon_base::FAVICON, helper.current_candidate()->icon_type);
 
   // Favicon should be requested from history.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(new_icon_url, history_handler->icon_url_);
-  EXPECT_EQ(FaviconURL::FAVICON, history_handler->icon_type_);
+  EXPECT_EQ(favicon_base::FAVICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Simulate find icon.
   SetFaviconBitmapResult(new_icon_url, &history_handler->history_results_);
   history_handler->InvokeCallback();
 
   // Shouldn't request download favicon
   EXPECT_FALSE(helper.download_handler()->HasDownload());
 
   // Verify the favicon status.
@@ skipping 28 matching lines @@
   // Verify FaviconHandler status.
   EXPECT_FALSE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(GURL(), driver.GetActiveFaviconURL());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
+  urls.push_back(FaviconURL(icon_url,
+                            favicon_base::TOUCH_PRECOMPOSED_ICON,
+                            std::vector<gfx::Size>()));
   urls.push_back(FaviconURL(
-      icon_url, FaviconURL::TOUCH_PRECOMPOSED_ICON, std::vector<gfx::Size>()));
+      new_icon_url, favicon_base::TOUCH_ICON, std::vector<gfx::Size>()));
   urls.push_back(FaviconURL(
-      new_icon_url, FaviconURL::TOUCH_ICON, std::vector<gfx::Size>()));
-  urls.push_back(
-      FaviconURL(new_icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
+      new_icon_url, favicon_base::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status.
   EXPECT_EQ(2U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(icon_url, helper.current_candidate()->icon_url);
-  ASSERT_EQ(FaviconURL::TOUCH_PRECOMPOSED_ICON,
+  ASSERT_EQ(favicon_base::TOUCH_PRECOMPOSED_ICON,
             helper.current_candidate()->icon_type);
 
   // Favicon should be requested from history.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(icon_url, history_handler->icon_url_);
-  EXPECT_EQ(FaviconURL::TOUCH_PRECOMPOSED_ICON, history_handler->icon_type_);
+  EXPECT_EQ(favicon_base::TOUCH_PRECOMPOSED_ICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Simulate not find icon.
   history_handler->history_results_.clear();
   history_handler->InvokeCallback();
 
   // Should request download favicon.
   DownloadHandler* download_handler = helper.download_handler();
   EXPECT_TRUE(helper.download_handler()->HasDownload());
 
   // Verify the download request.
   EXPECT_EQ(icon_url, download_handler->GetImageUrl());
 
   // Reset the history_handler to verify whether favicon is request from
   // history.
   helper.set_history_handler(NULL);
   // Smulates download failed.
   download_handler->set_failed(true);
   download_handler->InvokeCallback();
 
   // Left 1 url.
   EXPECT_EQ(1U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   EXPECT_EQ(new_icon_url, helper.current_candidate()->icon_url);
-  EXPECT_EQ(FaviconURL::TOUCH_ICON, helper.current_candidate()->icon_type);
+  EXPECT_EQ(favicon_base::TOUCH_ICON, helper.current_candidate()->icon_type);
 
   // Favicon should be requested from history.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(new_icon_url, history_handler->icon_url_);
-  EXPECT_EQ(FaviconURL::TOUCH_ICON, history_handler->icon_type_);
+  EXPECT_EQ(favicon_base::TOUCH_ICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Reset download handler
   download_handler->Reset();
 
   // Simulates getting a expired icon from history.
   SetFaviconBitmapResult(new_icon_url,
                          favicon_base::TOUCH_ICON,
                          true /* expired */,
                          &history_handler->history_results_);
   history_handler->InvokeCallback();
 
   // Verify the download request.
   EXPECT_TRUE(helper.download_handler()->HasDownload());
   EXPECT_EQ(new_icon_url, download_handler->GetImageUrl());
 
   helper.set_history_handler(NULL);
 
   // Simulates icon being downloaded.
   download_handler->InvokeCallback();
 
   // New icon should be saved to history backend.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(new_icon_url, history_handler->icon_url_);
-  EXPECT_EQ(FaviconURL::TOUCH_ICON, history_handler->icon_type_);
+  EXPECT_EQ(favicon_base::TOUCH_ICON, history_handler->icon_type_);
   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;
@@ skipping 17 matching lines @@
   // Verify FaviconHandler status.
   EXPECT_FALSE(driver.GetActiveFaviconValidity());
   EXPECT_EQ(GURL(), driver.GetActiveFaviconURL());
 
   // Reset the history_handler to verify whether new icon is requested from
   // history.
   helper.set_history_handler(NULL);
 
   // Simulates update with the different favicon url.
   std::vector<FaviconURL> urls;
+  urls.push_back(FaviconURL(icon_url,
+                            favicon_base::TOUCH_PRECOMPOSED_ICON,
+                            std::vector<gfx::Size>()));
   urls.push_back(FaviconURL(
-      icon_url, FaviconURL::TOUCH_PRECOMPOSED_ICON, std::vector<gfx::Size>()));
+      new_icon_url, favicon_base::TOUCH_ICON, std::vector<gfx::Size>()));
   urls.push_back(FaviconURL(
-      new_icon_url, FaviconURL::TOUCH_ICON, std::vector<gfx::Size>()));
-  urls.push_back(
-      FaviconURL(new_icon_url, FaviconURL::FAVICON, std::vector<gfx::Size>()));
+      new_icon_url, favicon_base::FAVICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(urls);
 
   // Verify FaviconHandler status.
   EXPECT_EQ(2U, helper.urls().size());
   ASSERT_TRUE(helper.current_candidate());
   ASSERT_EQ(icon_url, helper.current_candidate()->icon_url);
-  ASSERT_EQ(FaviconURL::TOUCH_PRECOMPOSED_ICON,
+  ASSERT_EQ(favicon_base::TOUCH_PRECOMPOSED_ICON,
             helper.current_candidate()->icon_type);
 
   // Favicon should be requested from history.
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(icon_url, history_handler->icon_url_);
-  EXPECT_EQ(FaviconURL::TOUCH_PRECOMPOSED_ICON, history_handler->icon_type_);
+  EXPECT_EQ(favicon_base::TOUCH_PRECOMPOSED_ICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Simulate not find icon.
   history_handler->history_results_.clear();
   history_handler->InvokeCallback();
 
   // Should request download favicon.
   DownloadHandler* download_handler = helper.download_handler();
   EXPECT_TRUE(helper.download_handler()->HasDownload());
 
   // Verify the download request.
   EXPECT_EQ(icon_url, download_handler->GetImageUrl());
 
   // Reset the history_handler to verify whether favicon is request from
   // history.
   helper.set_history_handler(NULL);
   const GURL latest_icon_url("http://www.google.com/latest_favicon");
   std::vector<FaviconURL> latest_urls;
   latest_urls.push_back(FaviconURL(
-      latest_icon_url, FaviconURL::TOUCH_ICON, std::vector<gfx::Size>()));
+      latest_icon_url, favicon_base::TOUCH_ICON, std::vector<gfx::Size>()));
   helper.OnUpdateFaviconURL(latest_urls);
 
   EXPECT_EQ(1U, helper.urls().size());
   EXPECT_EQ(latest_icon_url, helper.current_candidate()->icon_url);
-  EXPECT_EQ(FaviconURL::TOUCH_ICON, helper.current_candidate()->icon_type);
+  EXPECT_EQ(favicon_base::TOUCH_ICON, helper.current_candidate()->icon_type);
 
   // Whether new icon is requested from history
   history_handler = helper.history_handler();
   ASSERT_TRUE(history_handler);
   EXPECT_EQ(latest_icon_url, history_handler->icon_url_);
-  EXPECT_EQ(FaviconURL::TOUCH_ICON, history_handler->icon_type_);
+  EXPECT_EQ(favicon_base::TOUCH_ICON, history_handler->icon_type_);
   EXPECT_EQ(page_url, history_handler->page_url_);
 
   // Reset the history_handler to verify whether favicon is request from
   // history.
   // Save the callback for late use.
   FaviconService::FaviconResultsCallback callback = history_handler->callback_;
   helper.set_history_handler(NULL);
 
   // Simulates download succeed.
   download_handler->InvokeCallback();
@@ skipping 19 matching lines @@
 #if !defined(OS_ANDROID)
 
 // Test the favicon which is selected when the web page provides several
 // favicons and none of the favicons are cached in history.
 // The goal of this test is to be more of an integration test than
 // SelectFaviconFramesTest.*.
 TEST_F(FaviconHandlerTest, MultipleFavicons) {
   const GURL kPageURL("http://www.google.com");
   const FaviconURL kSourceIconURLs[] = {
       FaviconURL(GURL("http://www.google.com/a"),
-                 FaviconURL::FAVICON,
+                 favicon_base::FAVICON,
                  std::vector<gfx::Size>()),
       FaviconURL(GURL("http://www.google.com/b"),
-                 FaviconURL::FAVICON,
+                 favicon_base::FAVICON,
                  std::vector<gfx::Size>()),
       FaviconURL(GURL("http://www.google.com/c"),
-                 FaviconURL::FAVICON,
+                 favicon_base::FAVICON,
                  std::vector<gfx::Size>()),
       FaviconURL(GURL("http://www.google.com/d"),
-                 FaviconURL::FAVICON,
+                 favicon_base::FAVICON,
                  std::vector<gfx::Size>()),
       FaviconURL(GURL("http://www.google.com/e"),
-                 FaviconURL::FAVICON,
+                 favicon_base::FAVICON,
                  std::vector<gfx::Size>())};
 
   // 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
@@ skipping 75 matching lines @@
 
   std::vector<gfx::Size> icon2;
   icon2.push_back(gfx::Size(15, 15));
   icon2.push_back(gfx::Size(16, 16));
 
   std::vector<gfx::Size> icon3;
   icon3.push_back(gfx::Size(16, 16));
   icon3.push_back(gfx::Size(14, 14));
 
   const FaviconURL kSourceIconURLs[] = {
-      FaviconURL(GURL("http://www.google.com/a"),
-                 FaviconURL::FAVICON,
-                 icon1),
-      FaviconURL(GURL("http://www.google.com/b"),
-                 FaviconURL::FAVICON,
-                 icon2),
-      FaviconURL(GURL("http://www.google.com/c"),
-                 FaviconURL::FAVICON,
-                 icon3),
+      FaviconURL(GURL("http://www.google.com/a"), favicon_base::FAVICON, icon1),
+      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"),
-                 FaviconURL::FAVICON,
+                 favicon_base::FAVICON,
                  std::vector<gfx::Size>()),
       FaviconURL(GURL("http://www.google.com/e"),
-                 FaviconURL::FAVICON,
+                 favicon_base::FAVICON,
                  std::vector<gfx::Size>())};
 
   TestFaviconClient client;
   TestFaviconDriver driver1;
   TestFaviconHandler handler1(
       kPageURL, &client, &driver1, FaviconHandler::FAVICON, true);
   std::vector<FaviconURL> urls1(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSourceIconURLs));
   UpdateFaviconURL(&handler1, kPageURL, urls1);
 
@@ skipping 31 matching lines @@
 
   std::vector<gfx::Size> one_icon;
   one_icon.push_back(gfx::Size(15, 15));
   one_icon.push_back(gfx::Size(512, 512));
 
   std::vector<gfx::Size> two_icons;
   two_icons.push_back(gfx::Size(16, 16));
   two_icons.push_back(gfx::Size(14, 14));
 
   const FaviconURL kSourceIconURLs[] = {
-      FaviconURL(GURL("http://www.google.com/a"),
-                 FaviconURL::FAVICON,
-                 too_large),
-      FaviconURL(GURL("http://www.google.com/b"),
-                 FaviconURL::FAVICON,
-                 one_icon),
-      FaviconURL(GURL("http://www.google.com/c"),
-                 FaviconURL::FAVICON,
-                 two_icons),
+      FaviconURL(
+          GURL("http://www.google.com/a"), favicon_base::FAVICON, too_large),
+      FaviconURL(
+          GURL("http://www.google.com/b"), favicon_base::FAVICON, one_icon),
+      FaviconURL(
+          GURL("http://www.google.com/c"), favicon_base::FAVICON, two_icons),
       FaviconURL(GURL("http://www.google.com/d"),
-                 FaviconURL::FAVICON,
+                 favicon_base::FAVICON,
                  std::vector<gfx::Size>()),
       FaviconURL(GURL("http://www.google.com/e"),
-                 FaviconURL::FAVICON,
+                 favicon_base::FAVICON,
                  std::vector<gfx::Size>())};
 
   TestFaviconClient client;
   TestFaviconDriver driver1;
   TestFaviconHandler handler1(
       kPageURL, &client, &driver1, FaviconHandler::FAVICON, true);
   std::vector<FaviconURL> urls1(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSourceIconURLs));
   UpdateFaviconURL(&handler1, kPageURL, urls1);
 
@@ skipping 47 matching lines @@
   const GURL kPageURL("http://www.google.com");
 
   std::vector<gfx::Size> one_icon;
   one_icon.push_back(gfx::Size(15, 15));
 
   std::vector<gfx::Size> two_icons;
   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"),
-                 FaviconURL::FAVICON,
-                 one_icon),
-      FaviconURL(GURL("http://www.google.com/c"),
-                 FaviconURL::FAVICON,
-                 two_icons)};
+      FaviconURL(
+          GURL("http://www.google.com/b"), favicon_base::FAVICON, one_icon),
+      FaviconURL(
+          GURL("http://www.google.com/c"), favicon_base::FAVICON, two_icons)};
 
   TestFaviconClient client;
   TestFaviconDriver driver1;
   TestFaviconHandler handler1(
       kPageURL, &client, &driver1, FaviconHandler::FAVICON, true);
   std::vector<FaviconURL> urls1(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSourceIconURLs));
   UpdateFaviconURL(&handler1, kPageURL, urls1);
 
   ASSERT_EQ(2u, handler1.urls().size());
@@ skipping 39 matching lines @@
 
   std::vector<gfx::Size> icon1;
   icon1.push_back(gfx::Size(16, 16));
   const int actual_size1 = 10;
 
   std::vector<gfx::Size> icon2;
   icon2.push_back(gfx::Size(15, 15));
   const int actual_size2 = 12;
 
   const FaviconURL kSourceIconURLs[] = {
-      FaviconURL(GURL("http://www.google.com/b"),
-                 FaviconURL::FAVICON,
-                 icon1),
-      FaviconURL(GURL("http://www.google.com/c"),
-                 FaviconURL::FAVICON,
-                 icon2),
+      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"),
-                 FaviconURL::FAVICON,
+                 favicon_base::FAVICON,
                  std::vector<gfx::Size>())};
 
   TestFaviconClient client;
   TestFaviconDriver driver1;
   TestFaviconHandler handler1(
       kPageURL, &client, &driver1, FaviconHandler::FAVICON, true);
   std::vector<FaviconURL> urls1(kSourceIconURLs,
                                 kSourceIconURLs + arraysize(kSourceIconURLs));
   UpdateFaviconURL(&handler1, kPageURL, urls1);
   ASSERT_EQ(3u, handler1.urls().size());
@@ skipping 117 matching lines @@
   download_id = favicon_tab_helper->StartDownload(missing_icon_url, 0);
   EXPECT_NE(0, download_id);
   // Report download success with HTTP 200 status.
   favicon_tab_helper->DidDownloadFavicon(download_id, 200, missing_icon_url,
       empty_icons, empty_icon_sizes);
   // Icon is not marked as UnableToDownload as HTTP status is not 404.
   EXPECT_FALSE(favicon_service->WasUnableToDownloadFavicon(missing_icon_url));
 }
 
 }  // namespace.