Support Using ScopedFeatureList in BrowserTest

chrome/browser/process_singleton_browsertest.cc

Index: chrome/browser/process_singleton_browsertest.cc
diff --git a/chrome/browser/process_singleton_browsertest.cc b/chrome/browser/process_singleton_browsertest.cc
index 939f0e8d6fd98cfdf0bd8d944cb8de1943c60456..d49432b1e48b479d603f2f211a7580787665a51b 100644
--- a/chrome/browser/process_singleton_browsertest.cc
+++ b/chrome/browser/process_singleton_browsertest.cc
@@ -35,6 +35,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_launcher_utils.h"
+#include "content/public/common/content_switches.h"
 
 namespace {
 
@@ -79,6 +80,12 @@ class ChromeStarter : public base::RefCountedThreadSafe<ChromeStarter> {
     // Add the normal test-mode switches, except for the ones we're adding
     // ourselves.
     base::CommandLine standard_switches(base::CommandLine::NO_PROGRAM);
+
+    // Turn off preconnects because they break the brittle python webserver;
+    // see http://crbug.com/60035.
+    command_line.AppendSwitchASCII(switches::kDisableFeatures,
+                                   "NetworkPrediction");

[Ilya Sherman, 2017/06/09 20:19:28]

Is this actually necessary?  I don't think this test uses the Python webserver
-- does it?

+
     test_launcher_utils::PrepareBrowserCommandLineForTests(&standard_switches);
     const base::CommandLine::SwitchMap& switch_map =
         standard_switches.GetSwitches();