Revert 150875 - Disable captive portal detection prior to merging to M22.

BUG=141134

Review URL: https://chromiumcodereview.appspot.com/10830138

TBR=mmenke@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10836203

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151317 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/captive_portal/captive_portal_service.cc

@@ -94,8 +94,7 @@ void RecordRepeatHistograms(Result result,
 
 }  // namespace
 
-// Disabled for M22.
-bool CaptivePortalService::is_disabled_for_testing_ = true;
+bool CaptivePortalService::is_disabled_for_testing_ = false;
 
 class CaptivePortalService::RecheckBackoffEntry : public net::BackoffEntry {
  public: