Added detection timeouts and usage of Retry-After HTTP header.

chrome/browser/captive_portal/captive_portal_detector.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/browser/captive_portal/captive_portal_detector.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 
 namespace captive_portal {
 
+namespace {
+
+const char* const kCaptivePortalResultNames[] = {
+  "InternetConnected",
+  "NoResponse",
+  "BehindCaptivePortal",
+  "NumCaptivePortalResults",
+};
+COMPILE_ASSERT(arraysize(kCaptivePortalResultNames) == RESULT_COUNT + 1,
+               captive_portal_result_name_count_mismatch);
+
+}  // namespace
+
 const char CaptivePortalDetector::kDefaultURL[] =
     "http://www.gstatic.com/generate_204";
 
 CaptivePortalDetector::CaptivePortalDetector(
     const scoped_refptr<net::URLRequestContextGetter>& request_context)
     : request_context_(request_context) {
 }
 
 CaptivePortalDetector::~CaptivePortalDetector() {
 }
@@ skipping 24 matching lines @@
       net::LOAD_DO_NOT_SEND_COOKIES |
       net::LOAD_DO_NOT_SEND_AUTH_DATA);
   url_fetcher_->Start();
 }
 
 void CaptivePortalDetector::Cancel() {
   url_fetcher_.reset();
   detection_callback_.Reset();
 }
 
+// static
+std::string CaptivePortalDetector::CaptivePortalResultToString(Result result) {
+  DCHECK_GE(result, 0);
+  DCHECK_LT(static_cast<unsigned int>(result),
+            arraysize(kCaptivePortalResultNames));
+  return kCaptivePortalResultNames[result];
+}
+
 void CaptivePortalDetector::OnURLFetchComplete(const net::URLFetcher* source) {
   DCHECK(CalledOnValidThread());
   DCHECK(FetchingURL());
   DCHECK_EQ(url_fetcher_.get(), source);
   DCHECK(!detection_callback_.is_null());
 
   Results results;
   GetCaptivePortalResultFromResponse(url_fetcher_.get(), &results);
   DetectionCallback callback = detection_callback_;
   url_fetcher_.reset();
@@ skipping 69 matching lines @@
     return base::Time::Now();
   else
     return time_for_testing_;
 }
 
 bool CaptivePortalDetector::FetchingURL() const {
   return url_fetcher_.get() != NULL;
 }
 
 }  // namespace captive_portal