[sync] Allow FakeURLFetcher to return an arbitrary URLRequestStatus

net/url_request/test_url_fetcher_factory.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 "net/url_request/test_url_fetcher_factory.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 265 matching lines @@
 }
 
 void TestURLFetcherFactory::SetDelegateForTests(
     TestURLFetcherDelegateForTests* delegate_for_tests) {
   delegate_for_tests_ = delegate_for_tests;
 }
 
 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);
 }
 
 FakeURLFetcher::~FakeURLFetcher() {}
 
 void FakeURLFetcher::Start() {
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&FakeURLFetcher::RunDelegate, weak_factory_.GetWeakPtr()));
 }
@@ skipping 18 matching lines @@
     const FakeURLFetcherCreator& creator)
     : ScopedURLFetcherFactory(this),
       creator_(creator),
       default_factory_(default_factory) {
 }
 
 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() {}
 
 URLFetcher* FakeURLFetcherFactory::CreateURLFetcher(
     int id,
     const GURL& url,
     URLFetcher::RequestType request_type,
     URLFetcherDelegate* d) {
   FakeResponseMap::const_iterator it = fake_responses_.find(url);
   if (it == fake_responses_.end()) {
     if (default_factory_ == NULL) {
       // If we don't have a baked response for that URL we return NULL.
       DLOG(ERROR) << "No baked response for URL: " << url.spec();
       return NULL;
     } else {
       return default_factory_->CreateURLFetcher(id, url, request_type, d);
     }
   }
 
   scoped_ptr<FakeURLFetcher> fake_fetcher =
       creator_.Run(url, d, it->second.first, it->second.second);
   // TODO: Make URLFetcherFactory::CreateURLFetcher return a scoped_ptr
   return fake_fetcher.release();
 }
 
 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() {
   fake_responses_.clear();
 }
 
 URLFetcherImplFactory::URLFetcherImplFactory() {}
 
 URLFetcherImplFactory::~URLFetcherImplFactory() {}
 
 URLFetcher* URLFetcherImplFactory::CreateURLFetcher(
     int id,
     const GURL& url,
     URLFetcher::RequestType request_type,
     URLFetcherDelegate* d) {
   return new URLFetcherImpl(url, request_type, d);
 }
 
 }  // namespace net