Enable captive portal detection by default.

chrome/test/base/test_launcher_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/test_launcher_utils.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 24 matching lines @@
   // default browser) that could conflicts with some tests expectations.
   command_line->AppendSwitch(switches::kNoDefaultBrowserCheck);
 
   // Enable warning level logging so that we can see when bad stuff happens.
   command_line->AppendSwitch(switches::kEnableLogging);
   command_line->AppendSwitchASCII(switches::kLoggingLevel, "1");  // warning
 
   // 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 SetUpCommandLine.

+    command_line->AppendSwitchASCII(switches::kCaptivePortalDetection,
+                                    switches::kCaptivePortalDetectionDisabled);
+  }
+
   // Don't install default apps.
   command_line->AppendSwitch(switches::kDisableDefaultApps);
 
   // Don't collect GPU info, load GPU blacklist, or schedule a GPU blacklist
   // auto-update.
   command_line->AppendSwitch(switches::kSkipGpuDataLoading);
 
   // The tests assume that file:// URIs can freely access other file:// URIs.
   command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
 
@@ skipping 45 matching lines @@
                               const std::string& implementation_name) {
   if (command_line->HasSwitch(switches::kUseGL))
     return false;
 
   command_line->AppendSwitchASCII(switches::kUseGL, implementation_name);
 
   return true;
 }
 
 }  // namespace test_launcher_utils