Replace --add-to-shelf flag with kAppBanners feature.

chrome/browser/banners/app_banner_manager_browsertest.cc

 // Copyright 2016 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 <vector>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 95 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(AppBannerManagerTest);
 };
 
 class AppBannerManagerBrowserTest : public InProcessBrowserTest {
  public:
   void SetUpOnMainThread() override {
     AppBannerSettingsHelper::SetTotalEngagementToTrigger(10);
     SiteEngagementScore::SetParamValuesForTesting();
     ASSERT_TRUE(embedded_test_server()->Start());
+
+    // Make sure app banners are disabled in the browser, otherwise they will
+    // interfere with the test.
+    feature_list_.InitAndDisableFeature(features::kAppBanners);
     InProcessBrowserTest::SetUpOnMainThread();
   }
 
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    // Make sure app banners are disabled in the browser, otherwise they will
-    // interfere with the test.
-    command_line->AppendSwitch(switches::kDisableAddToShelf);
-  }
-
  protected:
   // Returns a test server URL to page |page_url| with |manifest_url| injected
   // as the manifest tag.
   std::string GetURLOfPageWithManifest(const std::string& page_url,
                                        const std::string& manifest_url) {
     return page_url + embedded_test_server()->GetURL(manifest_url).spec();
   }
 
   // Returns a test server URL to a page controlled by a service worker with
   // |manifest_url| injected as the manifest tag.
@@ skipping 80 matching lines @@
       histograms.ExpectTotalCount(banners::kMinutesHistogram, 0);
       histograms.ExpectTotalCount(banners::kInstallableStatusCodeHistogram, 0);
     } else {
       histograms.ExpectTotalCount(banners::kMinutesHistogram,
                                   (manager->will_show() ? 1 : 0));
       histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
                                     expected_code_for_histogram, 1);
       EXPECT_FALSE(manager->need_to_log_status());
     }
   }
+
+  base::test::ScopedFeatureList feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, WebAppBannerCreated) {
   std::unique_ptr<AppBannerManagerTest> manager(
       CreateAppBannerManager(browser()));
   std::vector<double> engagement_scores{0, 10};
   RunBannerTest(browser(), manager.get(), "/banners/manifest_test_page.html",
                 engagement_scores, SHOWING_WEB_APP_BANNER, true);
 }
 
@@ skipping 151 matching lines @@
       CreateAppBannerManager(incognito_browser));
   std::vector<double> engagement_scores{10};
   RunBannerTest(incognito_browser, manager.get(),
                 "/banners/manifest_test_page.html", engagement_scores,
                 IN_INCOGNITO, false);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
                        CheckOnLoadWithSufficientEngagement) {
   base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(
-      features::kCheckInstallabilityForBannerOnLoad);
+  feature_list.InitWithFeatures({features::kCheckInstallabilityForBannerOnLoad},
+                                {features::kAppBanners});
   std::unique_ptr<AppBannerManagerTest> manager(
       CreateAppBannerManager(browser()));
   std::vector<double> engagement_scores{10};
   RunBannerTest(browser(), manager.get(), "/banners/manifest_test_page.html",
                 engagement_scores, SHOWING_WEB_APP_BANNER, true);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
                        CheckOnLoadWithSufficientEngagementCancelDirect) {
   base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(
-      features::kCheckInstallabilityForBannerOnLoad);
+  feature_list.InitWithFeatures({features::kCheckInstallabilityForBannerOnLoad},
+                                {features::kAppBanners});
   std::unique_ptr<AppBannerManagerTest> manager(
       CreateAppBannerManager(browser()));
   std::vector<double> engagement_scores{10};
   RunBannerTest(browser(), manager.get(), "/banners/cancel_test_page.html",
                 engagement_scores, RENDERER_CANCELLED, false);
 }
 
 IN_PROC_BROWSER_TEST_F(
     AppBannerManagerBrowserTest,
     CheckOnLoadWithSufficientEngagementCancelBannerAfterPromptInHandler) {
   base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(
-      features::kCheckInstallabilityForBannerOnLoad);
+  feature_list.InitWithFeatures({features::kCheckInstallabilityForBannerOnLoad},
+                                {features::kAppBanners});
   std::unique_ptr<AppBannerManagerTest> manager(
       CreateAppBannerManager(browser()));
   std::vector<double> engagement_scores{10};
   RunBannerTest(browser(), manager.get(),
                 "/banners/prompt_in_handler_test_page.html", engagement_scores,
                 SHOWING_WEB_APP_BANNER, true);
   std::string cancel_test_page_url =
       GetURLOfPageWithManifest("/banners/cancel_test_page.html?manifest=",
                                "/banners/manifest_different_start_url.json");
   RunBannerTest(browser(), manager.get(), cancel_test_page_url,
                 engagement_scores, RENDERER_CANCELLED, false);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest,
                        CheckOnLoadWithoutSufficientEngagement) {
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(1);
   SiteEngagementService* service =
       SiteEngagementService::Get(browser()->profile());
   base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(
-      features::kCheckInstallabilityForBannerOnLoad);
+  feature_list.InitWithFeatures({features::kCheckInstallabilityForBannerOnLoad},
+                                {features::kAppBanners});
   std::unique_ptr<AppBannerManagerTest> manager(
       CreateAppBannerManager(browser()));
 
   base::HistogramTester histograms;
   GURL test_url =
       embedded_test_server()->GetURL("/banners/manifest_test_page.html");
   service->ResetBaseScoreForURL(test_url, 0);
 
   // First run through: expect the manager to end up stopped in the pending
   // state, without showing a banner.
@@ skipping 27 matching lines @@
   EXPECT_FALSE(manager->need_to_log_status());
   EXPECT_TRUE(manager->is_complete());
 
   histograms.ExpectTotalCount(banners::kMinutesHistogram, 1);
   histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
                                 SHOWING_WEB_APP_BANNER, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, CheckOnLoadThenNavigate) {
   base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(
-      features::kCheckInstallabilityForBannerOnLoad);
+  feature_list.InitWithFeatures({features::kCheckInstallabilityForBannerOnLoad},
+                                {features::kAppBanners});
   std::unique_ptr<AppBannerManagerTest> manager(
       CreateAppBannerManager(browser()));
 
   base::HistogramTester histograms;
   GURL test_url =
       embedded_test_server()->GetURL("/banners/manifest_test_page.html");
 
   // First run through: expect the manager to end up stopped in the pending
   // state, without showing a banner.
   {
@@ skipping 21 matching lines @@
   EXPECT_FALSE(manager->will_show());
   EXPECT_FALSE(manager->is_active());
   EXPECT_FALSE(manager->need_to_log_status());
 
   histograms.ExpectTotalCount(banners::kMinutesHistogram, 0);
   histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
                                 INSUFFICIENT_ENGAGEMENT, 1);
 }
 
 }  // namespace banners