Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(588)

Unified Diff: chrome/test/base/test_launcher_utils.cc

Issue 10795038: Enable captive portal detection by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698