Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Unified Diff: chrome/browser/sync/glue/http_bridge.cc

Issue 7846007: net: Rename URLRequestStatus::os_error_. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix os_error_code Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/glue/http_bridge.cc
diff --git a/chrome/browser/sync/glue/http_bridge.cc b/chrome/browser/sync/glue/http_bridge.cc
index afe571433c87423a823bbbc0412613d49d0d5b2a..51a10e8660a74063aef2986484c3d48a84f036b7 100644
--- a/chrome/browser/sync/glue/http_bridge.cc
+++ b/chrome/browser/sync/glue/http_bridge.cc
@@ -117,7 +117,7 @@ HttpBridge::URLFetchState::URLFetchState() : url_poster(NULL),
request_completed(false),
request_succeeded(false),
http_response_code(-1),
- os_error_code(-1) {}
+ error_code(-1) {}
HttpBridge::URLFetchState::~URLFetchState() {}
HttpBridge::HttpBridge(HttpBridge::RequestContextGetter* context_getter)
@@ -181,7 +181,7 @@ void HttpBridge::SetPostPayload(const char* content_type,
}
}
-bool HttpBridge::MakeSynchronousPost(int* os_error_code, int* response_code) {
+bool HttpBridge::MakeSynchronousPost(int* error_code, int* response_code) {
DCHECK_EQ(MessageLoop::current(), created_on_loop_);
if (DCHECK_IS_ON()) {
base::AutoLock lock(fetch_state_lock_);
@@ -204,7 +204,7 @@ bool HttpBridge::MakeSynchronousPost(int* os_error_code, int* response_code) {
base::AutoLock lock(fetch_state_lock_);
DCHECK(fetch_state_.request_completed || fetch_state_.aborted);
- *os_error_code = fetch_state_.os_error_code;
+ *error_code = fetch_state_.error_code;
*response_code = fetch_state_.http_response_code;
return fetch_state_.request_succeeded;
}
@@ -261,7 +261,7 @@ void HttpBridge::Abort() {
BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE,
fetch_state_.url_poster);
fetch_state_.url_poster = NULL;
- fetch_state_.os_error_code = net::ERR_ABORTED;
+ fetch_state_.error_code = net::ERR_ABORTED;
http_post_completed_.Signal();
}
@@ -280,7 +280,7 @@ void HttpBridge::OnURLFetchComplete(const URLFetcher *source,
fetch_state_.request_succeeded =
(net::URLRequestStatus::SUCCESS == status.status());
fetch_state_.http_response_code = response_code;
- fetch_state_.os_error_code = status.os_error();
+ fetch_state_.error_code = status.error();
fetch_state_.response_content = data;
fetch_state_.response_headers = source->response_headers();
« no previous file with comments | « chrome/browser/sync/glue/http_bridge.h ('k') | chrome/browser/sync/internal_api/http_post_provider_interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698