Index: chrome/test/base/test_launcher_utils.cc |
=================================================================== |
--- chrome/test/base/test_launcher_utils.cc (revision 147935) |
+++ chrome/test/base/test_launcher_utils.cc (working copy) |
@@ -42,6 +42,13 @@ |
// Disable safebrowsing autoupdate. |
command_line->AppendSwitch(switches::kSbDisableAutoUpdate); |
+ // Unless otherwise specified, disable captive portal detection, to prevent it |
+ // from interfering with tests that don't expect it. |
+ if (!command_line->HasSwitch(switches::kCaptivePortalDetection)) { |
mmenke
2012/07/24 14:24:08
This is necessary because this is called after Set
|
+ command_line->AppendSwitchASCII(switches::kCaptivePortalDetection, |
+ switches::kCaptivePortalDetectionDisabled); |
+ } |
+ |
// Don't install default apps. |
command_line->AppendSwitch(switches::kDisableDefaultApps); |