Revert of Always prefer 192x192 on mobile, also for touch icons

components/favicon/core/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 "components/favicon/core/favicon_handler.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
@@ skipping 1192 matching lines @@
 
   EXPECT_THAT(
       handler->GetIconURLs(),
       ElementsAre(
           // The 512x512 bitmap is the best match for the desired size.
           kIconURL1024_512, kIconURL1_17, kIconURL16_14,
           // The rest of bitmaps come in order, there is no "sizes" attribute.
           kIconURLWithoutSize1, kIconURLWithoutSize2));
 }
 
-TEST_F(FaviconHandlerTest, TestSortTouchIconLargest) {
-  const GURL kIconURLWithoutSize("http://www.google.com/touchicon-nosize");
-  const GURL kIconURL144x144("http://www.google.com/touchicon144x144");
-  const GURL kIconURL192x192("http://www.google.com/touchicon192x192");
-
-  const std::vector<favicon::FaviconURL> kSourceIconURLs{
-      FaviconURL(kIconURLWithoutSize, TOUCH_ICON, kEmptySizes),
-      FaviconURL(kIconURL144x144, TOUCH_ICON,
-                 SizeVector(1U, gfx::Size(144, 144))),
-      FaviconURL(kIconURL192x192, TOUCH_ICON,
-                 SizeVector(1U, gfx::Size(192, 192))),
-  };
-
-  std::unique_ptr<FaviconHandler> handler = RunHandlerWithCandidates(
-      FaviconDriverObserver::TOUCH_LARGEST, kSourceIconURLs);
-
-  EXPECT_THAT(
-      handler->GetIconURLs(),
-      ElementsAre(kIconURL192x192, kIconURL144x144, kIconURLWithoutSize));
-}
-
 TEST_F(FaviconHandlerTest, TestDownloadLargestFavicon) {
   // Names represent the bitmap sizes per icon.
   const GURL kIconURL1024_512("http://www.google.com/a");
   const GURL kIconURL15_14("http://www.google.com/b");
   const GURL kIconURL16_512("http://www.google.com/c");
   const GURL kIconURLWithoutSize1("http://www.google.com/d");
   const GURL kIconURLWithoutSize2("http://www.google.com/e");
 
   RunHandlerWithCandidates(
       FaviconDriverObserver::NON_TOUCH_LARGEST,
@@ skipping 766 matching lines @@
 
   // Complete the download.
   EXPECT_CALL(favicon_service_, SetFavicons(_, kManifestURL2, _, _));
   EXPECT_CALL(delegate_, OnFaviconUpdated(_, _, kManifestURL2, _, _));
   EXPECT_TRUE(delegate_.fake_image_downloader().RunCallbackManually());
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace
 }  // namespace favicon