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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_transaction_unittest.cc

Issue 12310075: Cache failover to LOAD_PREFERRING_CACHE if network response suggests offline. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved new flag to nearer other flags in same file. Created 7 years, 9 months 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
« net/base/load_flags_list.h ('K') | « net/http/http_transaction_unittest.h ('k') | net/url_request/url_request_job_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_transaction_unittest.cc
diff --git a/net/http/http_transaction_unittest.cc b/net/http/http_transaction_unittest.cc
index 9eca8c67bef4e24191e15b5d06040b0b8143e15a..6cc988780b296c2748963a4327223a357fa004e1 100644
--- a/net/http/http_transaction_unittest.cc
+++ b/net/http/http_transaction_unittest.cc
@@ -38,7 +38,8 @@ const MockTransaction kSimpleGET_Transaction = {
"<html><body>Google Blah Blah</body></html>",
TEST_MODE_NORMAL,
NULL,
- 0
+ 0,
+ net::OK
};
const MockTransaction kSimplePOST_Transaction = {
@@ -53,7 +54,8 @@ const MockTransaction kSimplePOST_Transaction = {
"<html><body>Google Blah Blah</body></html>",
TEST_MODE_NORMAL,
NULL,
- 0
+ 0,
+ net::OK
};
const MockTransaction kTypicalGET_Transaction = {
@@ -69,7 +71,8 @@ const MockTransaction kTypicalGET_Transaction = {
"<html><body>Google Blah Blah</body></html>",
TEST_MODE_NORMAL,
NULL,
- 0
+ 0,
+ net::OK
};
const MockTransaction kETagGET_Transaction = {
@@ -85,7 +88,8 @@ const MockTransaction kETagGET_Transaction = {
"<html><body>Google Blah Blah</body></html>",
TEST_MODE_NORMAL,
NULL,
- 0
+ 0,
+ net::OK
};
const MockTransaction kRangeGET_Transaction = {
@@ -100,7 +104,8 @@ const MockTransaction kRangeGET_Transaction = {
"<html><body>Google Blah Blah</body></html>",
TEST_MODE_NORMAL,
NULL,
- 0
+ 0,
+ net::OK
};
static const MockTransaction* const kBuiltinMockTransactions[] = {
@@ -230,6 +235,14 @@ int MockNetworkTransaction::Start(const net::HttpRequestInfo* request,
if (!t)
return net::ERR_FAILED;
+ // Return immediately if we're returning in error.
+ if (net::OK != t->return_code) {
+ if (test_mode_ & TEST_MODE_SYNC_NET_START)
+ return t->return_code;
+ CallbackLater(callback, t->return_code);
+ return net::ERR_IO_PENDING;
+ }
+
std::string resp_status = t->status;
std::string resp_headers = t->response_headers;
std::string resp_data = t->data;
« net/base/load_flags_list.h ('K') | « net/http/http_transaction_unittest.h ('k') | net/url_request/url_request_job_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698