Enable feature to load icons from Web Manifests by defaut

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 1442 matching lines @@
       .WillByDefault(Return(true));
 
   RunHandlerWithSimpleFaviconCandidates({k404IconURL});
 
   EXPECT_THAT(
       histogram_tester.GetAllSamples("Favicons.DownloadOutcome"),
       ElementsAre(base::Bucket(static_cast<int>(DownloadOutcome::SKIPPED),
                                /*expected_count=*/1)));
 }
 
-// Test that the support for Web Manifest is disabled by default, unless the
-// feature is enabled.
-TEST_F(FaviconHandlerTest, IgnoreWebManifestByDefault) {
+// Test that the feature for loading icons from Web Manifests can be disabled.
+TEST_F(FaviconHandlerTest, IgnoreWebManifest) {
   const GURL kManifestURL("http://www.google.com/manifest.json");
+  base::test::ScopedFeatureList override_features;
+  override_features.InitAndDisableFeature(kFaviconsFromWebManifest);
 
   RunHandlerWithSimpleFaviconCandidates({kIconURL16x16}, kManifestURL);
   EXPECT_THAT(favicon_service_.fake()->db_requests(),
               Not(Contains(kManifestURL)));
   EXPECT_THAT(delegate_.downloads(), Not(Contains(kManifestURL)));
 }
 
+// Manifests are currently enabled by default. Leaving this fixture for
+// logical grouping and blame layer.
 class FaviconHandlerManifestsEnabledTest : public FaviconHandlerTest {
  protected:
   const GURL kManifestURL = GURL("http://www.google.com/manifest.json");
 
-  FaviconHandlerManifestsEnabledTest() {
-    override_features_.InitAndEnableFeature(kFaviconsFromWebManifest);
-  }
+  FaviconHandlerManifestsEnabledTest() = default;
 
  private:
-  base::test::ScopedFeatureList override_features_;
-
   DISALLOW_COPY_AND_ASSIGN(FaviconHandlerManifestsEnabledTest);
 };
 
 // Test that a favicon corresponding to a web manifest is reported when:
 // - There is data in the favicon database for the manifest URL.
 // AND
 // - FaviconService::OnFaviconDataForManifestFromFaviconService() runs before
 //   FaviconHandler::OnUpdateCandidates() is called.
 TEST_F(FaviconHandlerManifestsEnabledTest,
        GetFaviconFromManifestInHistoryIfCandidatesSlower) {
@@ skipping 471 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