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

chrome/browser/installable/installable_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 "chrome/browser/installable/installable_manager.h"
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_feature_list.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 using IconPurpose = content::Manifest::Icon::IconPurpose;
 
 namespace {
 
 const std::tuple<int, int, IconPurpose> kPrimaryIconParams{144, 144,
@@ skipping 147 matching lines @@
   GURL primary_icon_url_;
   std::unique_ptr<SkBitmap> primary_icon_;
   bool is_installable_;
 };
 
 class InstallableManagerBrowserTest : public InProcessBrowserTest {
  public:
   void SetUpOnMainThread() override {
     InProcessBrowserTest::SetUpOnMainThread();
     ASSERT_TRUE(embedded_test_server()->Start());
+
+    // Make sure app banners are disabled in the browser so they do not
+    // interfere with the test.
+    feature_list_.InitAndDisableFeature(features::kAppBanners);

[Ilya Sherman, 2017/06/22 16:36:22]

I'm not 100% sure, but I think this might be running too late to have any
effect.  Did you verify that removing this line affects how the test runs?

[benwells, 2017/06/23 02:09:26]

There is no problem with this, it does affect the tests in the correct way. It
isn't very clear to do it via a feature though, I have another patch lined up
which does this same thing with a static ForTesting style method.

   }
 
   // Returns a test server URL to a page controlled by a service worker with
   // |manifest_url| injected as the manifest tag.
   std::string GetURLOfPageWithServiceWorkerAndManifest(
       const std::string& manifest_url) {
     return "/banners/manifest_test_page.html?manifest=" +
            embedded_test_server()->GetURL(manifest_url).spec();
   }
 
   void NavigateAndRunInstallableManager(CallbackTester* tester,
                                         const InstallableParams& params,
                                         const std::string& url) {
     GURL test_url = embedded_test_server()->GetURL(url);
     ui_test_utils::NavigateToURL(browser(), test_url);
     RunInstallableManager(tester, params);
   }
 
   void RunInstallableManager(CallbackTester* tester,
                              const InstallableParams& params) {
     InstallableManager* manager = GetManager();
     manager->GetData(params,
                      base::Bind(&CallbackTester::OnDidFinishInstallableCheck,
                                 base::Unretained(tester)));
   }
 
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    // Make sure app banners are disabled in the browser so they do not
-    // interfere with the test.
-    command_line->AppendSwitch(switches::kDisableAddToShelf);
-  }
-
   InstallableManager* GetManager() {
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     InstallableManager::CreateForWebContents(web_contents);
     InstallableManager* manager =
         InstallableManager::FromWebContents(web_contents);
     CHECK(manager);
 
     return manager;
   }
 
   InstallabilityCheckStatus GetStatus() { return GetManager()->page_status_; }
+
+ private:
+  base::test::ScopedFeatureList feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_F(InstallableManagerBrowserTest,
                        ManagerBeginsInEmptyState) {
   // Ensure that the InstallableManager starts off with everything null.
   InstallableManager* manager = GetManager();
 
   EXPECT_TRUE(manager->manifest().IsEmpty());
   EXPECT_TRUE(manager->manifest_url().is_empty());
   EXPECT_TRUE(manager->icons_.empty());
@@ skipping 802 matching lines @@
                        CheckNestedCallsToGetData) {
   // Verify that we can call GetData while in a callback from GetData.
   base::RunLoop run_loop;
   InstallableParams params = GetWebAppParams();
   std::unique_ptr<NestedCallbackTester> tester(
       new NestedCallbackTester(GetManager(), params, run_loop.QuitClosure()));
 
   tester->Run();
   run_loop.Run();
 }