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

chrome/browser/captive_portal/captive_portal_detector_unittest.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/basictypes.h"
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/browser/captive_portal/testing_utils.h"
 #include "chrome/test/base/testing_profile.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
-#include "net/http/http_response_headers.h"
-#include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace captive_portal {
 
 namespace {
 
 class CaptivePortalClient {
  public:
   explicit CaptivePortalClient(CaptivePortalDetector* captive_portal_detector)
       : captive_portal_detector_(captive_portal_detector),
@@ skipping 34 matching lines @@
 
   void RunTest(const CaptivePortalDetector::Results& expected_results,
                int net_error,
                int status_code,
                const char* response_headers) {
     ASSERT_FALSE(FetchingURL());
 
     GURL url(CaptivePortalDetector::kDefaultURL);
     CaptivePortalClient client(detector());
 
-    net::TestURLFetcherFactory factory;
     detector()->DetectCaptivePortal(url,
         base::Bind(&CaptivePortalClient::OnPortalDetectionCompleted,
                    base::Unretained(&client)));
 
     ASSERT_TRUE(FetchingURL());
     MessageLoop::current()->RunUntilIdle();
 
-    net::TestURLFetcher* fetcher = factory.GetFetcherByID(0);
-    if (net_error != net::OK) {
-      EXPECT_FALSE(response_headers);
-      fetcher->set_status(net::URLRequestStatus(net::URLRequestStatus::FAILED,
-                                                net_error));
-    } else {
-      fetcher->set_response_code(status_code);
-      if (response_headers) {
-        scoped_refptr<net::HttpResponseHeaders> headers(
-            CreateResponseHeaders(response_headers));
-        EXPECT_EQ(status_code, headers->response_code());
-        fetcher->set_response_headers(headers);
-      }
-    }
-
-    OnURLFetchComplete(fetcher);
+    CompleteURLFetch(net_error, status_code, response_headers);
 
     EXPECT_FALSE(FetchingURL());
     EXPECT_EQ(1, client.num_results_received());
     EXPECT_EQ(expected_results.result, client.captive_portal_results().result);
     EXPECT_EQ(expected_results.retry_after_delta,
               client.captive_portal_results().retry_after_delta);
   }
 
   void RunCancelTest() {
     ASSERT_FALSE(FetchingURL());
 
     GURL url(CaptivePortalDetector::kDefaultURL);
     CaptivePortalClient client(detector());
 
-    net::TestURLFetcherFactory factory;
     detector()->DetectCaptivePortal(url,
         base::Bind(&CaptivePortalClient::OnPortalDetectionCompleted,
                    base::Unretained(&client)));
 
     ASSERT_TRUE(FetchingURL());
     MessageLoop::current()->RunUntilIdle();
 
     detector()->Cancel();
 
     ASSERT_FALSE(FetchingURL());
@@ skipping 83 matching lines @@
 }
 
 TEST_F(CaptivePortalDetectorTest, Cancel) {
   RunCancelTest();
   CaptivePortalDetector::Results results;
   results.result = RESULT_INTERNET_CONNECTED;
   RunTest(results, net::OK, 204, NULL);
 }
 
 }  // namespace captive_portal