Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(449)

Unified Diff: chrome/browser/captive_portal/testing_utils.cc

Issue 11419070: Added detection timeouts and usage of Retry-After HTTP header. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/captive_portal/testing_utils.cc
diff --git a/chrome/browser/captive_portal/testing_utils.cc b/chrome/browser/captive_portal/testing_utils.cc
index de0c73da537797336caa6672b6590497448e899b..d55bd17ddabd0bd96102b0dbcfd9c455b41eb3b9 100644
--- a/chrome/browser/captive_portal/testing_utils.cc
+++ b/chrome/browser/captive_portal/testing_utils.cc
@@ -4,9 +4,13 @@
#include "chrome/browser/captive_portal/testing_utils.h"
+#include "base/logging.h"
+#include "base/memory/ref_counted.h"
+#include "net/base/net_errors.h"
+#include "net/http/http_response_headers.h"
#include "net/http/http_util.h"
-namespace captive_portal {
+namespace {
scoped_refptr<net::HttpResponseHeaders> CreateResponseHeaders(
const std::string& response_headers) {
@@ -16,6 +20,10 @@ scoped_refptr<net::HttpResponseHeaders> CreateResponseHeaders(
return new net::HttpResponseHeaders(raw_headers);
}
+} // namespace
+
+namespace captive_portal {
+
CaptivePortalDetectorTestBase::CaptivePortalDetectorTestBase()
: detector_(NULL) {
}
@@ -35,9 +43,24 @@ bool CaptivePortalDetectorTestBase::FetchingURL() {
return detector()->FetchingURL();
}
-void CaptivePortalDetectorTestBase::OnURLFetchComplete(
- net::URLFetcher* fetcher) {
- detector()->OnURLFetchComplete(fetcher);
+void CaptivePortalDetectorTestBase::CompleteURLFetch(
+ int net_error,
+ int status_code,
+ const char* response_headers) {
+ if (net_error != net::OK) {
+ DCHECK(!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));
+ DCHECK_EQ(status_code, headers->response_code());
+ fetcher()->set_response_headers(headers);
+ }
+ }
+ detector()->OnURLFetchComplete(fetcher());
}
} // namespace captive_portal
« no previous file with comments | « chrome/browser/captive_portal/testing_utils.h ('k') | chrome/browser/chromeos/net/network_portal_detector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698