Index: chrome/test/base/in_process_browser_test.cc |
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc |
index 5b534919f297435350f1790d2ded684c7af5f2c5..7a7fdb0420e5ca8dda842d7ea897fc76afbe5556 100644 |
--- a/chrome/test/base/in_process_browser_test.cc |
+++ b/chrome/test/base/in_process_browser_test.cc |
@@ -28,6 +28,7 @@ |
#include "chrome/browser/lifetime/termination_notification.h" |
#include "chrome/browser/net/chrome_network_delegate.h" |
#include "chrome/browser/net/net_error_tab_helper.h" |
+#include "chrome/browser/net/predictor.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/ui/browser.h" |
@@ -191,11 +192,6 @@ void InProcessBrowserTest::SetUp() { |
// Browser tests will create their own g_browser_process later. |
DCHECK(!g_browser_process); |
- // Clear the FeatureList instance from base/test/test_suite.cc. Since this is |
- // a browser test, a FeatureList will be registered as part of normal browser |
- // start up in ChromeBrowserMainParts::SetupMetricsAndFieldTrials(). |
- base::FeatureList::ClearInstanceForTesting(); |
- |
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
// Auto-reload breaks many browser tests, which assume error pages won't be |
@@ -204,6 +200,10 @@ void InProcessBrowserTest::SetUp() { |
// here. |
command_line->AppendSwitch(switches::kDisableOfflineAutoReload); |
+ // Turn off preconnects because they break the brittle python webserver; |
+ // see http://crbug.com/60035. |
+ scoped_feature_list_.InitAndDisableFeature(features::kNetworkPrediction); |
+ |
// Allow subclasses to change the command line before running any tests. |
SetUpCommandLine(command_line); |
// Add command line arguments that are used by all InProcessBrowserTests. |