[sync] Allow FakeURLFetcher to return an arbitrary URLRequestStatus

net/url_request/test_url_fetcher_factory.cc

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 62fbb074691064bc01e45a6b3d6c29c370f0de47..42e8fce0e027a55835c3351a44cb1bd4dc6c1b95 100644
--- a/net/url_request/test_url_fetcher_factory.cc
+++ b/net/url_request/test_url_fetcher_factory.cc
@@ -283,15 +283,11 @@ void TestURLFetcherFactory::SetDelegateForTests(
 FakeURLFetcher::FakeURLFetcher(const GURL& url,
                                URLFetcherDelegate* d,
                                const std::string& response_data,
-                               HttpStatusCode response_code)
+                               URLRequestStatus request_status)
     : TestURLFetcher(0, url, d),
       weak_factory_(this) {
-  set_status(URLRequestStatus(
-      // 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(response_code);
+  set_status(request_status);
+  set_response_code(HttpStatusCode(request_status.error()));
   SetResponseString(response_data);
 }
 
@@ -330,11 +326,11 @@ scoped_ptr<FakeURLFetcher> FakeURLFetcherFactory::DefaultFakeURLFetcherCreator(
       const GURL& url,
       URLFetcherDelegate* delegate,
       const std::string& response_data,
-      HttpStatusCode response_code) {
+      URLRequestStatus request_status) {
   return scoped_ptr<FakeURLFetcher>(new FakeURLFetcher(url,
                                                        delegate,
                                                        response_data,
-                                                       response_code));
+                                                       request_status));
 }
 
 FakeURLFetcherFactory::~FakeURLFetcherFactory() {}
@@ -364,9 +360,11 @@ URLFetcher* FakeURLFetcherFactory::CreateURLFetcher(
 void FakeURLFetcherFactory::SetFakeResponse(
     const GURL& url,
     const std::string& response_data,
-    HttpStatusCode response_code) {
+    HttpStatusCode response_code,
+    URLRequestStatus::Status status) {
   // Overwrite existing URL if it already exists.
-  fake_responses_[url] = std::make_pair(response_data, response_code);
+  fake_responses_[url] = std::make_pair(
+      response_data, URLRequestStatus(status, response_code));

[akalin, 2013/11/05 22:03:09]

is the 'error' field in URLRequestStatus supposed to hold a response code? From
the comments it seems like it's supposed to hold a net::Error. I'd rather just
have the FakeURLFetcher take in and store the response_code and status
separately, or update the comments to URLRequestStatus to indicate the error
field == response code (and/or update the name of that field, too).

[Raghu Simha, 2013/11/05 22:09:07]

In that case, it probably makes sense to store the response_code and status
separately. This means we'll have to change FakeResponseMap to be a mapping
between a GURL and a struct containing response text, response code and status.

Updated CL coming up.

 }
 
 void FakeURLFetcherFactory::ClearFakeResponses() {