Enable feature to load icons from Web Manifests by defaut

chrome/browser/favicon/content_favicon_driver_browsertest.cc

 // Copyright 2015 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/content/content_favicon_driver.h"
 
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
@@ skipping 244 matching lines @@
     chrome::ExecuteCommand(browser(), IDC_RELOAD_BYPASSING_CACHE);
     waiter.Wait();
   }
   ASSERT_TRUE(delegate->was_requested());
   EXPECT_TRUE(delegate->bypassed_cache());
 }
 
 // Test that loading a page that contains icons only in the Web Manifest causes
 // those icons to be used.
 IN_PROC_BROWSER_TEST_F(ContentFaviconDriverTest, LoadIconFromWebManifest) {
-  base::test::ScopedFeatureList override_features;
-  override_features.InitAndEnableFeature(favicon::kFaviconsFromWebManifest);
-
   ASSERT_TRUE(embedded_test_server()->Start());
   GURL url = embedded_test_server()->GetURL("/favicon/page_with_manifest.html");
   GURL icon_url = embedded_test_server()->GetURL("/favicon/icon.png");
 
   std::unique_ptr<TestResourceDispatcherHostDelegate> delegate(
       new TestResourceDispatcherHostDelegate(icon_url));
   content::ResourceDispatcherHost::Get()->SetDelegate(delegate.get());
 
   PendingTaskWaiter waiter(web_contents(), this);
   ui_test_utils::NavigateToURLWithDisposition(
@@ skipping 11 matching lines @@
 // Test that loading a page that contains a Web Manifest without icons and a
 // regular favicon in the HTML reports the icon. The regular icon is initially
 // cached in the Favicon database.
 IN_PROC_BROWSER_TEST_F(ContentFaviconDriverTest,
                        LoadRegularIconDespiteWebManifestWithoutIcons) {
   ASSERT_TRUE(embedded_test_server()->Start());
   GURL url = embedded_test_server()->GetURL(
       "/favicon/page_with_manifest_without_icons.html");
   GURL icon_url = embedded_test_server()->GetURL("/favicon/icon.png");
 
-  // Initial visit with the feature still disabled, to populate the cache.
+  // Initial visit with the feature disabled, to populate the cache.
   {
+    base::test::ScopedFeatureList override_features;
+    override_features.InitAndDisableFeature(favicon::kFaviconsFromWebManifest);
+
     PendingTaskWaiter waiter(web_contents(), this);
     ui_test_utils::NavigateToURLWithDisposition(
         browser(), url, WindowOpenDisposition::CURRENT_TAB,
         ui_test_utils::BROWSER_TEST_NONE);
     waiter.Wait();
   }
   ASSERT_NE(nullptr, GetFaviconForPageURL(url).bitmap_data);
 
   ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
 
-  // Enable the feature and visit the page again.
-  base::test::ScopedFeatureList override_features;
-  override_features.InitAndEnableFeature(favicon::kFaviconsFromWebManifest);
-
+  // Visit the page again now that the feature is enabled (default).
   {
     PendingTaskWaiter waiter(web_contents(), this);
     ui_test_utils::NavigateToURLWithDisposition(
         browser(), url, WindowOpenDisposition::CURRENT_TAB,
         ui_test_utils::BROWSER_TEST_NONE);
     waiter.Wait();
   }
 
   EXPECT_NE(nullptr, GetFaviconForPageURL(url).bitmap_data);
 }