Treat touch icons just like non-touch icons on mobile

components/favicon/core/favicon_handler.cc

Index: components/favicon/core/favicon_handler.cc
diff --git a/components/favicon/core/favicon_handler.cc b/components/favicon/core/favicon_handler.cc
index 64c8961ae23ad760d06e826ee6e04bf06b7f1b2d..48ec2682ed60745ac2199115a83e009b1f3a2531 100644
--- a/components/favicon/core/favicon_handler.cc
+++ b/components/favicon/core/favicon_handler.cc
@@ -24,11 +24,13 @@
 namespace favicon {
 namespace {
 
-const int kNonTouchLargestIconSize = 192;
-
+#if defined(OS_IOS)
 // Size (along each axis) of a touch icon. This currently corresponds to
 // the apple touch icon for iPad.
-const int kTouchIconSize = 144;
+const int kLargestIconSize = 144;
+#else
+const int kLargestIconSize = 192;
+#endif
 
 // Returns true if all of the icon URLs and icon types in |bitmap_results| are
 // identical and if they match |icon_url| and |icon_type|. Returns false if
@@ -120,10 +122,8 @@ std::vector<int> GetDesiredPixelSizes(
       }
       return pixel_sizes;
     }
-    case FaviconDriverObserver::NON_TOUCH_LARGEST:
-      return std::vector<int>(1U, kNonTouchLargestIconSize);
-    case FaviconDriverObserver::TOUCH_LARGEST:
-      return std::vector<int>(1U, kTouchIconSize);
+    case FaviconDriverObserver::LARGEST:
+      return std::vector<int>(1U, kLargestIconSize);
   }
   NOTREACHED();
   return std::vector<int>();
@@ -161,9 +161,7 @@ FaviconHandler::FaviconHandler(
       initial_history_result_expired_or_incomplete_(false),
       redownload_icons_(false),
       icon_types_(FaviconHandler::GetIconTypesFromHandlerType(handler_type)),
-      download_largest_icon_(
-          handler_type == FaviconDriverObserver::NON_TOUCH_LARGEST ||
-          handler_type == FaviconDriverObserver::TOUCH_LARGEST),
+      download_largest_icon_(handler_type == FaviconDriverObserver::LARGEST),
       notification_icon_type_(favicon_base::INVALID_ICON),
       service_(service),
       delegate_(delegate),
@@ -179,10 +177,10 @@ int FaviconHandler::GetIconTypesFromHandlerType(
     FaviconDriverObserver::NotificationIconType handler_type) {
   switch (handler_type) {
     case FaviconDriverObserver::NON_TOUCH_16_DIP:
-    case FaviconDriverObserver::NON_TOUCH_LARGEST:
       return favicon_base::FAVICON;
-    case FaviconDriverObserver::TOUCH_LARGEST:
-      return favicon_base::TOUCH_ICON | favicon_base::TOUCH_PRECOMPOSED_ICON;
+    case FaviconDriverObserver::LARGEST:
+      return favicon_base::FAVICON | favicon_base::TOUCH_ICON |
+             favicon_base::TOUCH_PRECOMPOSED_ICON;
   }
   return 0;
 }