Support Using ScopedFeatureList in BrowserTest

content/public/test/browser_test_base.cc

Index: content/public/test/browser_test_base.cc
diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc
index e956f2d6b0c002423d133e1a82675f7991768319..402de98170218de6077306bc6af4c6ed8dfdcd44 100644
--- a/content/public/test/browser_test_base.cc
+++ b/content/public/test/browser_test_base.cc
@@ -230,6 +230,11 @@ void BrowserTestBase::SetUp() {
 
   SetUpInProcessBrowserTestFixture();
 
+  DCHECK(!command_line->HasSwitch(switches::kEnableFeatures))
+      << "Should not use CommandLine to modify features.";

[Ilya Sherman, 2017/06/13 22:42:48]

Please list this as a comment if you'd like to include it.  Outputting strings
with DCHECKs adds weight to the binary, and hence is only recommended when
outputting non-static data, e.g. a filename.

[chaopeng, 2017/06/28 14:16:51]

Done.

+  DCHECK(!command_line->HasSwitch(switches::kDisableFeatures))
+      << "Should not use CommandLine to modify features.";
+
   // At this point, copy features to the command line, since BrowserMain will
   // wipe out the current feature list.
   std::string enabled_features;