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

Side by Side 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 chrome_frame 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/glue/http_bridge.h" 5 #include "chrome/browser/sync/glue/http_bridge.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/message_loop_proxy.h" 8 #include "base/message_loop_proxy.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "content/browser/browser_thread.h" 10 #include "content/browser/browser_thread.h"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 const std::string &data) { 273 const std::string &data) {
274 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 274 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
275 base::AutoLock lock(fetch_state_lock_); 275 base::AutoLock lock(fetch_state_lock_);
276 if (fetch_state_.aborted) 276 if (fetch_state_.aborted)
277 return; 277 return;
278 278
279 fetch_state_.request_completed = true; 279 fetch_state_.request_completed = true;
280 fetch_state_.request_succeeded = 280 fetch_state_.request_succeeded =
281 (net::URLRequestStatus::SUCCESS == status.status()); 281 (net::URLRequestStatus::SUCCESS == status.status());
282 fetch_state_.http_response_code = response_code; 282 fetch_state_.http_response_code = response_code;
283 fetch_state_.os_error_code = status.os_error(); 283 fetch_state_.os_error_code = status.error();
284 284
285 fetch_state_.response_content = data; 285 fetch_state_.response_content = data;
286 fetch_state_.response_headers = source->response_headers(); 286 fetch_state_.response_headers = source->response_headers();
287 287
288 // End of the line for url_poster_. It lives only on the IO loop. 288 // End of the line for url_poster_. It lives only on the IO loop.
289 // We defer deletion because we're inside a callback from a component of the 289 // We defer deletion because we're inside a callback from a component of the
290 // URLFetcher, so it seems most natural / "polite" to let the stack unwind. 290 // URLFetcher, so it seems most natural / "polite" to let the stack unwind.
291 MessageLoop::current()->DeleteSoon(FROM_HERE, fetch_state_.url_poster); 291 MessageLoop::current()->DeleteSoon(FROM_HERE, fetch_state_.url_poster);
292 fetch_state_.url_poster = NULL; 292 fetch_state_.url_poster = NULL;
293 293
294 // Wake the blocked syncer thread in MakeSynchronousPost. 294 // Wake the blocked syncer thread in MakeSynchronousPost.
295 // WARNING: DONT DO ANYTHING AFTER THIS CALL! |this| may be deleted! 295 // WARNING: DONT DO ANYTHING AFTER THIS CALL! |this| may be deleted!
296 http_post_completed_.Signal(); 296 http_post_completed_.Signal();
297 } 297 }
298 298
299 } // namespace browser_sync 299 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698