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

chrome/browser/plugins/flash_permission_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 "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
 #include "chrome/browser/permissions/permissions_browsertest.h"
 #include "chrome/browser/ui/permission_bubble/mock_permission_prompt_factory.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/variations/variations_switches.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/ppapi_test_utils.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "url/gurl.h"
@@ skipping 24 matching lines @@
   FlashPermissionBrowserTest()
       : PermissionsBrowserTest("/permissions/flash.html") {}
   ~FlashPermissionBrowserTest() override {}
 
   // PermissionsBrowserTest
   void SetUpCommandLine(base::CommandLine* command_line) override {
     PermissionsBrowserTest::SetUpCommandLine(command_line);
 
     ASSERT_TRUE(ppapi::RegisterFlashTestPlugin(command_line));
 
+#if BUILDFLAG(ENABLE_PLUGINS)

[Ilya Sherman, 2017/06/12 21:50:29]

Why did you add this #if wrapper?

[chaopeng, 2017/06/28 19:21:24]

This feature only define when enable plugins.
https://cs.chromium.org/chromium/src/chrome/common/chrome_features.cc?rcl=239...

     // Set a high engagement threshhold so it doesn't interfere with testing the
     // permission.

[Ilya Sherman, 2017/06/12 21:50:29]

Why did you drop the setting of the param?

[chaopeng, 2017/06/28 19:21:24]

Done.

-    command_line->AppendSwitchASCII(switches::kEnableFeatures,
-                                    "PreferHtmlOverPlugins<Study1");
-    command_line->AppendSwitchASCII(switches::kForceFieldTrials,
-                                    "Study1/Enabled/");
-    command_line->AppendSwitchASCII(
-        variations::switches::kForceFieldTrialParams,
-        "Study1.Enabled:engagement_threshold_for_flash/100");
+    scoped_feature_list_.InitAndEnableFeature(features::kPreferHtmlOverPlugins);
+#endif
   }
 
   void TriggerPrompt() override {
     if (prompt_factory()->response_type() ==
         PermissionRequestManager::ACCEPT_ALL) {
       // If the prompt will be allowed, we need to wait for the page to refresh.
       PageReloadWaiter reload_waiter(GetWebContents());
       EXPECT_TRUE(RunScriptReturnBool("triggerPrompt();"));
       EXPECT_TRUE(reload_waiter.Wait());
     } else {
@@ skipping 13 matching lines @@
     // and tests should always wait for that reload to finish before calling
     // this method.
     ui_test_utils::NavigateToURL(browser(),
                                  GetWebContents()->GetLastCommittedURL());
     // If either flash with or without fallback content runs successfully it
     // indicates the feature is at least partly working, which could imply a
     // faulty permission.
     return RunScriptReturnBool("flashIsEnabled();") ||
            RunScriptReturnBool("flashIsEnabledForPluginWithoutFallback();");
   }
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest,
                        CommonFailsBeforeRequesting) {
   CommonFailsBeforeRequesting();
 }
 
 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, CommonFailsIfDismissed) {
   CommonFailsIfDismissed();
 }
@@ skipping 107 matching lines @@
       browser(), GURL("file://" + test_path.AsUTF8Unsafe() + test_url()));
   CommonFailsIfBlocked();
   EXPECT_EQ(1, prompt_factory()->TotalRequestCount());
 
   // Navigate to a second URL to verify it's blocked on all file: URLs.
   ui_test_utils::NavigateToURL(
       browser(),
       GURL("file://" + test_path.AsUTF8Unsafe() + "/permissions/flash2.html"));
   EXPECT_FALSE(FeatureUsageSucceeds());
 }