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

chrome/browser/captive_portal/captive_portal_detector.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_DETECTOR_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_DETECTOR_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 48 matching lines @@
       const scoped_refptr<net::URLRequestContextGetter>& request_context);
   virtual ~CaptivePortalDetector();
 
   // Triggers a check for a captive portal. After completion, runs the
   // |callback|.
   void DetectCaptivePortal(const GURL& url, const DetectionCallback& callback);
 
   // Cancels captive portal check.
   void Cancel();
 
+  static std::string CaptivePortalResultToString(Result result);

[Nikita (slow), 2012/11/21 11:32:10]

Static should go first.

[ygorshenin1, 2012/11/21 12:11:11]

Done.

+
  private:
   friend class CaptivePortalDetectorTestBase;
 
   // net::URLFetcherDelegate:
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // Takes a net::URLFetcher that has finished trying to retrieve the
   // test URL, and fills a Results struct based on its result.  If the
   // response is a 503 with a Retry-After header, |retry_after| field
   // of |results| is populated accordingly.  Otherwise, it's set to
@@ skipping 27 matching lines @@
 
   // Test time used by unit tests.
   base::Time time_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalDetector);
 };
 
 }  // namespace captive_portal
 
 #endif  // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_DETECTOR_H_