Index: chrome/browser/banners/app_banner_manager_browsertest.cc |
diff --git a/chrome/browser/banners/app_banner_manager_browsertest.cc b/chrome/browser/banners/app_banner_manager_browsertest.cc |
index 61565d65a29f0d43ffaf58f77df0cf531ccf7ad5..4f014568e351a0d87b4934340dff02a7921bca5e 100644 |
--- a/chrome/browser/banners/app_banner_manager_browsertest.cc |
+++ b/chrome/browser/banners/app_banner_manager_browsertest.cc |
@@ -113,13 +113,11 @@ class AppBannerManagerBrowserTest : public InProcessBrowserTest { |
AppBannerSettingsHelper::SetTotalEngagementToTrigger(10); |
SiteEngagementScore::SetParamValuesForTesting(); |
ASSERT_TRUE(embedded_test_server()->Start()); |
- 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); |
+ feature_list_.InitAndDisableFeature(features::kAppBanners); |
+ InProcessBrowserTest::SetUpOnMainThread(); |
} |
protected: |
@@ -222,6 +220,8 @@ class AppBannerManagerBrowserTest : public InProcessBrowserTest { |
EXPECT_FALSE(manager->need_to_log_status()); |
} |
} |
+ |
+ base::test::ScopedFeatureList feature_list_; |
}; |
IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, WebAppBannerCreated) { |
@@ -393,8 +393,8 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, DoesNotShowInIncognito) { |
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}; |
@@ -405,8 +405,8 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, |
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}; |
@@ -418,8 +418,8 @@ 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}; |
@@ -439,8 +439,8 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, |
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())); |
@@ -488,8 +488,8 @@ IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, |
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())); |