[Cleanup] Move all browsertests to use ScopedFeatureList to modify features

chrome/browser/ui/search/local_ntp_browsertest.cc

 // Copyright 2013 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 <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
 #include "base/threading/thread_restrictions.h"
+#include "build/build_config.h"

[chaopeng, 2017/06/30 19:32:37]

I got warning point to add this header file.

[Ilya Sherman, 2017/07/03 21:21:59]

That makes sense, since you're adding OS_ #if-stmts below.

 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/one_google_bar/one_google_bar_data.h"
 #include "chrome/browser/search/one_google_bar/one_google_bar_fetcher.h"
 #include "chrome/browser/search/one_google_bar/one_google_bar_service.h"
 #include "chrome/browser/search/one_google_bar/one_google_bar_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/search/instant_test_base.h"
 #include "chrome/browser/ui/search/instant_test_utils.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_data.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/signin/core/browser/signin_manager.h"
@@ skipping 222 matching lines @@
   EXPECT_EQ(base::ASCIIToUTF16("Nouvel onglet"), active_tab->GetTitle());
 }
 
 // In contrast to LocalNTPTest, this one doesn't set up any special NTP
 // wrangling. It just turns on the local NTP.
 class LocalNTPSmokeTest : public InProcessBrowserTest {
  public:
   LocalNTPSmokeTest() {}
 
  protected:
-  void SetUpCommandLine(base::CommandLine* cmdline) override {
-    cmdline->AppendSwitchASCII(switches::kEnableFeatures, "UseGoogleLocalNtp");
+  void SetUp() override {
+    scoped_feature_list_.InitAndEnableFeature(features::kUseGoogleLocalNtp);
+    InProcessBrowserTest::SetUp();
   }
 
   void SetUserSelectedDefaultSearchProvider(const std::string& base_url) {
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     TemplateURLData data;
     data.SetShortName(base::UTF8ToUTF16(base_url));
     data.SetKeyword(base::UTF8ToUTF16(base_url));
     data.SetURL(base_url + "url?bar={searchTerms}");
 
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
     TemplateURL* template_url =
         template_url_service->Add(base::MakeUnique<TemplateURL>(data));
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url);
   }
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_F(LocalNTPSmokeTest, GoogleNTPLoadsWithoutError) {
   // Open a new blank tab.
   content::WebContents* active_tab = OpenNewTab(browser(), GURL("about:blank"));
   ASSERT_FALSE(search::IsInstantNTP(active_tab));
 
   // Attach a console observer, listening for any message ("*" pattern).
   content::ConsoleObserverDelegate console_observer(active_tab, "*");
   active_tab->SetDelegate(&console_observer);
@@ skipping 70 matching lines @@
 
  private:
   base::Optional<OneGoogleBarData> one_google_bar_data_;
 };
 
 class LocalNTPOneGoogleBarSmokeTest : public InProcessBrowserTest {
  public:
   LocalNTPOneGoogleBarSmokeTest() {}
 
  protected:
-  void SetUpCommandLine(base::CommandLine* cmdline) override {
-    cmdline->AppendSwitchASCII(switches::kEnableFeatures,
-                               "UseGoogleLocalNtp,OneGoogleBarOnLocalNtp");
+  void SetUp() override {
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+    scoped_feature_list_.InitWithFeatures(
+        {features::kUseGoogleLocalNtp, features::kOneGoogleBarOnLocalNtp}, {});
+#else
+    scoped_feature_list_.InitAndEnableFeature(features::kUseGoogleLocalNtp);
+#endif
+    InProcessBrowserTest::SetUp();
   }
 
   void SetUpInProcessBrowserTestFixture() override {
     will_create_browser_context_services_subscription_ =
         BrowserContextDependencyManager::GetInstance()
             ->RegisterWillCreateBrowserContextServicesCallbackForTesting(
                 base::Bind(&LocalNTPOneGoogleBarSmokeTest::
                                OnWillCreateBrowserContextServices,
                            base::Unretained(this)));
   }
@@ skipping 14 matching lines @@
   }
 
   void OnWillCreateBrowserContextServices(content::BrowserContext* context) {
     OneGoogleBarServiceFactory::GetInstance()->SetTestingFactory(
         context, &LocalNTPOneGoogleBarSmokeTest::CreateOneGoogleBarService);
   }
 
   std::unique_ptr<
       base::CallbackList<void(content::BrowserContext*)>::Subscription>
       will_create_browser_context_services_subscription_;
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_F(LocalNTPOneGoogleBarSmokeTest,
                        NTPLoadsWithoutErrorOnNetworkFailure) {
   // Open a new blank tab.
   content::WebContents* active_tab = OpenNewTab(browser(), GURL("about:blank"));
   ASSERT_FALSE(search::IsInstantNTP(active_tab));
 
   // Attach a console observer, listening for any message ("*" pattern).
   content::ConsoleObserverDelegate console_observer(active_tab, "*");
@@ skipping 39 matching lines @@
 
   bool in_head_ran = false;
   ASSERT_TRUE(instant_test_utils::GetBoolFromJS(
       active_tab, "!!window.inHeadRan", &in_head_ran));
   EXPECT_TRUE(in_head_ran);
   bool after_bar_ran = false;
   ASSERT_TRUE(instant_test_utils::GetBoolFromJS(
       active_tab, "!!window.afterBarRan", &after_bar_ran));
   EXPECT_TRUE(after_bar_ran);
 }