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

chrome/browser/media/encrypted_media_supported_types_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 <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 271 matching lines @@
 class EncryptedMediaSupportedTypesExternalClearKeyTest
     : public EncryptedMediaSupportedTypesTest {
 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line);
     RegisterPepperCdm(command_line, media::kClearKeyCdmBaseDirectory,
                       media::kClearKeyCdmAdapterFileName,
                       media::kClearKeyCdmDisplayName,
                       media::kClearKeyCdmPepperMimeType);
-    command_line->AppendSwitchASCII(switches::kEnableFeatures,
-                                    media::kExternalClearKeyForTesting.name);
+    scoped_feature_list_.InitAndEnableFeature(
+        media::kExternalClearKeyForTesting);

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

Could this be done outside of SetUpCommandLine()?

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

Done.

   }
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 #endif  // BUILDFLAG(ENABLE_PEPPER_CDMS)
 };
 
 // By default, the External Clear Key (ECK) key system is not supported even if
 // present. This test case tests this behavior by not enabling
 // kExternalClearKeyForTesting.
 // Even registering the Pepper CDM where applicable does not enable the CDM.
 class EncryptedMediaSupportedTypesExternalClearKeyNotEnabledTest
     : public EncryptedMediaSupportedTypesTest {
  protected:
@@ skipping 16 matching lines @@
 // Registers ClearKey CDM with the wrong path (filename).
 class EncryptedMediaSupportedTypesClearKeyCDMRegisteredWithWrongPathTest
     : public EncryptedMediaSupportedTypesTest {
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line);
     RegisterPepperCdm(command_line, media::kClearKeyCdmBaseDirectory,
                       "clearkeycdmadapterwrongname.dll",
                       media::kClearKeyCdmDisplayName,
                       media::kClearKeyCdmPepperMimeType, false);
-    command_line->AppendSwitchASCII(switches::kEnableFeatures,
-                                    media::kExternalClearKeyForTesting.name);
+
+    scoped_feature_list_.InitAndEnableFeature(
+        media::kExternalClearKeyForTesting);

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

Could this be done outside of SetUpCommandLine()?

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

Done.

   }
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 // Registers Widevine CDM with the wrong path (filename).
 class EncryptedMediaSupportedTypesWidevineCDMRegisteredWithWrongPathTest
     : public EncryptedMediaSupportedTypesTest {
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line);
     RegisterPepperCdm(command_line, "WidevineCdm",
                       "widevinecdmadapterwrongname.dll",
@@ skipping 466 matching lines @@
       kVideoWebMMimeType, video_webm_codecs(), kWidevine));
 
   // Clear Key should still be registered.
   EXPECT_SUCCESS(AreCodecsSupportedByKeySystem(kVideoWebMMimeType,
                                                video_webm_codecs(), kClearKey));
 }
 #endif  // !defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // BUILDFLAG(ENABLE_PEPPER_CDMS)
 
 }  // namespace chrome