Fix all failed and canceled URLRequestStatuses without errors.

google_apis/gaia/oauth2_api_call_flow_unittest.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.
 //
 // A complete set of unit tests for OAuth2MintTokenFlow.
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_access_token_consumer.h"
 #include "google_apis/gaia/oauth2_access_token_fetcher_impl.h"
 #include "google_apis/gaia/oauth2_api_call_flow.h"
+#include "net/base/net_errors.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_fetcher_factory.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_status.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 70 matching lines @@
 class OAuth2ApiCallFlowTest : public testing::Test {
  protected:
   OAuth2ApiCallFlowTest()
       : request_context_getter_(new net::TestURLRequestContextGetter(
             message_loop_.task_runner())) {}
 
   TestURLFetcher* CreateURLFetcher(
       const GURL& url, bool fetch_succeeds,
       int response_code, const std::string& body) {
     TestURLFetcher* url_fetcher = new TestURLFetcher(0, url, &flow_);
-    URLRequestStatus::Status status =
-        fetch_succeeds ? URLRequestStatus::SUCCESS : URLRequestStatus::FAILED;
-    url_fetcher->set_status(URLRequestStatus(status, 0));
+    net::Error error = fetch_succeeds ? net::OK : net::ERR_FAILED;
+    url_fetcher->set_status(URLRequestStatus::FromError(error));
 
     if (response_code != 0)
       url_fetcher->set_response_code(response_code);
 
     if (!body.empty())
       url_fetcher->SetResponseString(body);
 
     return url_fetcher;
   }
 
@@ skipping 43 matching lines @@
   TestURLFetcher* url_fetcher = SetupApiCall(true, net::HTTP_OK);
   flow_.Start(request_context_getter_.get(), kAccessToken);
   HttpRequestHeaders headers;
   url_fetcher->GetExtraRequestHeaders(&headers);
   std::string auth_header;
   EXPECT_TRUE(headers.GetHeader("Authorization", &auth_header));
   EXPECT_EQ("Bearer access_token", auth_header);
   EXPECT_EQ(url, url_fetcher->GetOriginalURL());
   EXPECT_EQ(body, url_fetcher->upload_data());
 }