Treat touch icons just like non-touch icons on mobile

components/favicon/core/favicon_handler_unittest.cc

Index: components/favicon/core/favicon_handler_unittest.cc
diff --git a/components/favicon/core/favicon_handler_unittest.cc b/components/favicon/core/favicon_handler_unittest.cc
index 5a608b8ec5446bff4af2dfe69ff1338178c962a3..435ba43fb4eecbdad96d95f39d198a7c47c8e487 100644
--- a/components/favicon/core/favicon_handler_unittest.cc
+++ b/components/favicon/core/favicon_handler_unittest.cc
@@ -570,14 +570,14 @@ TEST_F(FaviconHandlerTest, Download2ndFaviconURLCandidate) {
                             /*expired=*/true));
 
   EXPECT_CALL(delegate_,
-              OnFaviconUpdated(kPageURL, FaviconDriverObserver::TOUCH_LARGEST,
+              OnFaviconUpdated(kPageURL, FaviconDriverObserver::LARGEST,
                                kIconURL64x64, /*icon_url_changed=*/true, _));
   EXPECT_CALL(delegate_,
-              OnFaviconUpdated(kPageURL, FaviconDriverObserver::TOUCH_LARGEST,
+              OnFaviconUpdated(kPageURL, FaviconDriverObserver::LARGEST,
                                kIconURL64x64, /*icon_url_changed=*/false, _));
 
   RunHandlerWithCandidates(
-      FaviconDriverObserver::TOUCH_LARGEST,
+      FaviconDriverObserver::LARGEST,
       {
           FaviconURL(kIconURLReturning500, TOUCH_PRECOMPOSED_ICON, kEmptySizes),
           FaviconURL(kIconURL64x64, TOUCH_ICON, kEmptySizes),
@@ -905,8 +905,8 @@ TEST_F(FaviconHandlerTest, TestSortFavicon) {
       FaviconURL(kIconURLWithoutSize1, FAVICON, kEmptySizes),
       FaviconURL(kIconURLWithoutSize2, FAVICON, kEmptySizes)};
 
-  std::unique_ptr<FaviconHandler> handler = RunHandlerWithCandidates(
-      FaviconDriverObserver::NON_TOUCH_LARGEST, kSourceIconURLs);
+  std::unique_ptr<FaviconHandler> handler =
+      RunHandlerWithCandidates(FaviconDriverObserver::LARGEST, kSourceIconURLs);
 
   EXPECT_THAT(
       handler->GetIconURLs(),
@@ -926,7 +926,7 @@ TEST_F(FaviconHandlerTest, TestDownloadLargestFavicon) {
   const GURL kIconURLWithoutSize2("http://www.google.com/e");
 
   RunHandlerWithCandidates(
-      FaviconDriverObserver::NON_TOUCH_LARGEST,
+      FaviconDriverObserver::LARGEST,
       {FaviconURL(kIconURL1024_512, FAVICON,
                   {gfx::Size(1024, 1024), gfx::Size(512, 512)}),
        FaviconURL(kIconURL15_14, FAVICON,
@@ -954,12 +954,11 @@ TEST_F(FaviconHandlerTest, TestSelectLargestFavicon) {
   delegate_.fake_downloader().Add(kIconURL2, IntVector{14, 16});
 
   // Verify NotifyFaviconAvailable().
-  EXPECT_CALL(delegate_,
-              OnFaviconUpdated(_, FaviconDriverObserver::NON_TOUCH_LARGEST,
-                               kIconURL2, _, _));
+  EXPECT_CALL(delegate_, OnFaviconUpdated(_, FaviconDriverObserver::LARGEST,
+                                          kIconURL2, _, _));
 
   RunHandlerWithCandidates(
-      FaviconDriverObserver::NON_TOUCH_LARGEST,
+      FaviconDriverObserver::LARGEST,
       {FaviconURL(kIconURL1, FAVICON, {gfx::Size(15, 15)}),
        FaviconURL(kIconURL2, FAVICON, {gfx::Size(14, 14), gfx::Size(16, 16)})});
 
@@ -967,8 +966,8 @@ TEST_F(FaviconHandlerTest, TestSelectLargestFavicon) {
 }
 
 TEST_F(FaviconHandlerTest, TestFaviconWasScaledAfterDownload) {
-  const int kMaximalSize = FaviconHandler::GetMaximalIconSize(
-      FaviconDriverObserver::NON_TOUCH_LARGEST);
+  const int kMaximalSize =
+      FaviconHandler::GetMaximalIconSize(FaviconDriverObserver::LARGEST);
 
   const GURL kIconURL1("http://www.google.com/b");
   const GURL kIconURL2("http://www.google.com/c");
@@ -988,7 +987,7 @@ TEST_F(FaviconHandlerTest, TestFaviconWasScaledAfterDownload) {
                                ImageSizeIs(kMaximalSize, kMaximalSize)));
 
   RunHandlerWithCandidates(
-      FaviconDriverObserver::NON_TOUCH_LARGEST,
+      FaviconDriverObserver::LARGEST,
       {FaviconURL(kIconURL1, FAVICON,
                   SizeVector{gfx::Size(kOriginalSize1, kOriginalSize1)}),
        FaviconURL(kIconURL2, FAVICON,
@@ -1005,7 +1004,7 @@ TEST_F(FaviconHandlerTest, TestKeepDownloadedLargestFavicon) {
               OnFaviconUpdated(_, _, kIconURL12x12, _, ImageSizeIs(12, 12)));
 
   RunHandlerWithCandidates(
-      FaviconDriverObserver::NON_TOUCH_LARGEST,
+      FaviconDriverObserver::LARGEST,
       {FaviconURL(kIconURL10x10, FAVICON, SizeVector{gfx::Size(16, 16)}),
        FaviconURL(kIconURL12x12, FAVICON, SizeVector{gfx::Size(15, 15)}),
        FaviconURL(kIconURL16x16, FAVICON, kEmptySizes)});