summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authordavidben <davidben@chromium.org>2015-08-05 09:34:55 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-05 16:35:50 +0000
commit5c411d94add205780f6e6c701aecc9b297d885b0 (patch)
treeb4a93ddcd9e50354b8d269c643767ac09592e85e /chromeos
parentaa0bbfd03137269c065c170442422f9d2015ac4c (diff)
downloadchromium_src-5c411d94add205780f6e6c701aecc9b297d885b0.zip
chromium_src-5c411d94add205780f6e6c701aecc9b297d885b0.tar.gz
chromium_src-5c411d94add205780f6e6c701aecc9b297d885b0.tar.bz2
Fix all failed and canceled URLRequestStatuses without errors.
As a step towards removing URLRequestStatus::Status, stop creating FAILED and CANCELED URLRequestStatuses without supplying an error. IO_PENDING is left for later as that'll want a bit more careful auditing of error() callers. BUG=490311 Review URL: https://codereview.chromium.org/1239993004 Cr-Commit-Position: refs/heads/master@{#341913}
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/login/auth/mock_url_fetchers.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chromeos/login/auth/mock_url_fetchers.cc b/chromeos/login/auth/mock_url_fetchers.cc
index 490f56b..0b4879b 100644
--- a/chromeos/login/auth/mock_url_fetchers.cc
+++ b/chromeos/login/auth/mock_url_fetchers.cc
@@ -11,6 +11,7 @@
#include "base/single_thread_task_runner.h"
#include "base/strings/stringprintf.h"
#include "base/thread_task_runner_handle.h"
+#include "net/base/net_errors.h"
#include "net/http/http_status_code.h"
#include "net/url_request/url_fetcher.h"
#include "net/url_request/url_fetcher_delegate.h"
@@ -50,7 +51,7 @@ GotCanceledFetcher::GotCanceledFetcher(
net::URLFetcherDelegate* d)
: net::TestURLFetcher(0, url, d) {
set_url(url);
- set_status(net::URLRequestStatus(net::URLRequestStatus::CANCELED, 0));
+ set_status(net::URLRequestStatus::FromError(net::ERR_ABORTED));
set_response_code(net::HTTP_FORBIDDEN);
}
@@ -86,7 +87,7 @@ FailFetcher::FailFetcher(bool success,
net::URLFetcherDelegate* d)
: net::TestURLFetcher(0, url, d) {
set_url(url);
- set_status(net::URLRequestStatus(net::URLRequestStatus::FAILED, ECONNRESET));
+ set_status(net::URLRequestStatus::FromError(net::ERR_CONNECTION_RESET));
set_response_code(net::HTTP_OK);
}