Enable captive portal detection by default.

chrome/browser/captive_portal/captive_portal_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
@@ skipping 58 matching lines @@
   // detected, this URL will take us to the captive portal landing page.
   const GURL& test_url() const { return test_url_; }
 
   // Result of the most recent captive portal check.
   Result last_detection_result() const { return last_detection_result_; }
 
   // Whether or not the CaptivePortalService is enabled.  When disabled, all
   // checks return INTERNET_CONNECTED.
   bool enabled() const { return enabled_; }
 
+  // Used to disable captive portal detection so it doesn't interfere with
+  // tests.  Should be called before the service is created.
+  static void set_is_disabled_for_tests(bool is_disabled_for_tests) {

[jam, 2012/07/26 21:47:53]

nit: name this set_is_disabled_for_testing. there is a presubmit check that
ensures that *for_testing and ForTesting methods are only called by tests

[mmenke, 2012/07/26 22:08:28]

Done.

+    is_disabled_for_tests_ = is_disabled_for_tests;
+  }
+  static bool is_disabled_for_tests() { return is_disabled_for_tests_; }
+
  private:
   friend class CaptivePortalServiceTest;
   friend class CaptivePortalBrowserTest;
 
   // Subclass of BackoffEntry that uses the CaptivePortalService's
   // GetCurrentTime function, for unit testing.
   class RecheckBackoffEntry;
 
   enum State {
     // No check is running or pending.
@@ skipping 115 matching lines @@
   // URL that returns a 204 response code when connected to the Internet.
   GURL test_url_;
 
   // The pref member for whether navigation errors should be resolved with a web
   // service.  Actually called "alternate_error_pages", since it's also used for
   // the Link Doctor.
   BooleanPrefMember resolve_errors_with_web_service_;
 
   base::OneShotTimer<CaptivePortalService> check_captive_portal_timer_;
 
+  static bool is_disabled_for_tests_;
+
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalService);
 };
 
 }  // namespace captive_portal
 
 #endif  // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_