Index: net/url_request/test_url_fetcher_factory.cc |
diff --git a/net/url_request/test_url_fetcher_factory.cc b/net/url_request/test_url_fetcher_factory.cc |
index e4a47d7728080adf5fbcfb14ffb6bd4e0d76b21c..62fbb074691064bc01e45a6b3d6c29c370f0de47 100644 |
--- a/net/url_request/test_url_fetcher_factory.cc |
+++ b/net/url_request/test_url_fetcher_factory.cc |
@@ -283,13 +283,15 @@ void TestURLFetcherFactory::SetDelegateForTests( |
FakeURLFetcher::FakeURLFetcher(const GURL& url, |
URLFetcherDelegate* d, |
const std::string& response_data, |
- bool success) |
+ HttpStatusCode response_code) |
: TestURLFetcher(0, url, d), |
weak_factory_(this) { |
set_status(URLRequestStatus( |
- success ? URLRequestStatus::SUCCESS : URLRequestStatus::FAILED, |
+ // Status is FAILED for HTTP/5xx server errors, and SUCCESS otherwise. |
+ response_code >= HTTP_INTERNAL_SERVER_ERROR ? URLRequestStatus::FAILED : |
+ URLRequestStatus::SUCCESS, |
0)); |
- set_response_code(success ? 200 : 500); |
+ set_response_code(response_code); |
SetResponseString(response_data); |
} |
@@ -327,10 +329,12 @@ FakeURLFetcherFactory::FakeURLFetcherFactory( |
scoped_ptr<FakeURLFetcher> FakeURLFetcherFactory::DefaultFakeURLFetcherCreator( |
const GURL& url, |
URLFetcherDelegate* delegate, |
- const std::string& response, |
- bool success) { |
- return scoped_ptr<FakeURLFetcher>(new FakeURLFetcher(url, delegate, |
- response, success)); |
+ const std::string& response_data, |
+ HttpStatusCode response_code) { |
+ return scoped_ptr<FakeURLFetcher>(new FakeURLFetcher(url, |
+ delegate, |
+ response_data, |
+ response_code)); |
} |
FakeURLFetcherFactory::~FakeURLFetcherFactory() {} |
@@ -360,9 +364,9 @@ URLFetcher* FakeURLFetcherFactory::CreateURLFetcher( |
void FakeURLFetcherFactory::SetFakeResponse( |
const GURL& url, |
const std::string& response_data, |
- bool success) { |
+ HttpStatusCode response_code) { |
// Overwrite existing URL if it already exists. |
- fake_responses_[url] = std::make_pair(response_data, success); |
+ fake_responses_[url] = std::make_pair(response_data, response_code); |
} |
void FakeURLFetcherFactory::ClearFakeResponses() { |