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

Side by Side Diff: net/http/http_proxy_client_socket.cc

Issue 10534129: NetLogEventParameter to Callback refactoring 5. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Add back original URLs Created 8 years, 6 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
« no previous file with comments | « net/http/http_pipelined_connection_impl.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/http/http_proxy_client_socket.h" 5 #include "net/http/http_proxy_client_socket.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 case STATE_GENERATE_AUTH_TOKEN: 329 case STATE_GENERATE_AUTH_TOKEN:
330 DCHECK_EQ(OK, rv); 330 DCHECK_EQ(OK, rv);
331 rv = DoGenerateAuthToken(); 331 rv = DoGenerateAuthToken();
332 break; 332 break;
333 case STATE_GENERATE_AUTH_TOKEN_COMPLETE: 333 case STATE_GENERATE_AUTH_TOKEN_COMPLETE:
334 rv = DoGenerateAuthTokenComplete(rv); 334 rv = DoGenerateAuthTokenComplete(rv);
335 break; 335 break;
336 case STATE_SEND_REQUEST: 336 case STATE_SEND_REQUEST:
337 DCHECK_EQ(OK, rv); 337 DCHECK_EQ(OK, rv);
338 net_log_.BeginEvent( 338 net_log_.BeginEvent(
339 NetLog::TYPE_HTTP_TRANSACTION_TUNNEL_SEND_REQUEST, NULL); 339 NetLog::TYPE_HTTP_TRANSACTION_TUNNEL_SEND_REQUEST);
340 rv = DoSendRequest(); 340 rv = DoSendRequest();
341 break; 341 break;
342 case STATE_SEND_REQUEST_COMPLETE: 342 case STATE_SEND_REQUEST_COMPLETE:
343 rv = DoSendRequestComplete(rv); 343 rv = DoSendRequestComplete(rv);
344 net_log_.EndEventWithNetErrorCode( 344 net_log_.EndEventWithNetErrorCode(
345 NetLog::TYPE_HTTP_TRANSACTION_TUNNEL_SEND_REQUEST, rv); 345 NetLog::TYPE_HTTP_TRANSACTION_TUNNEL_SEND_REQUEST, rv);
346 break; 346 break;
347 case STATE_READ_HEADERS: 347 case STATE_READ_HEADERS:
348 DCHECK_EQ(OK, rv); 348 DCHECK_EQ(OK, rv);
349 net_log_.BeginEvent( 349 net_log_.BeginEvent(
350 NetLog::TYPE_HTTP_TRANSACTION_TUNNEL_READ_HEADERS, NULL); 350 NetLog::TYPE_HTTP_TRANSACTION_TUNNEL_READ_HEADERS);
351 rv = DoReadHeaders(); 351 rv = DoReadHeaders();
352 break; 352 break;
353 case STATE_READ_HEADERS_COMPLETE: 353 case STATE_READ_HEADERS_COMPLETE:
354 rv = DoReadHeadersComplete(rv); 354 rv = DoReadHeadersComplete(rv);
355 net_log_.EndEventWithNetErrorCode( 355 net_log_.EndEventWithNetErrorCode(
356 NetLog::TYPE_HTTP_TRANSACTION_TUNNEL_READ_HEADERS, rv); 356 NetLog::TYPE_HTTP_TRANSACTION_TUNNEL_READ_HEADERS, rv);
357 break; 357 break;
358 case STATE_DRAIN_BODY: 358 case STATE_DRAIN_BODY:
359 DCHECK_EQ(OK, rv); 359 DCHECK_EQ(OK, rv);
360 rv = DoDrainBody(); 360 rv = DoDrainBody();
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 509
510 int HttpProxyClientSocket::DoTCPRestartComplete(int result) { 510 int HttpProxyClientSocket::DoTCPRestartComplete(int result) {
511 if (result != OK) 511 if (result != OK)
512 return result; 512 return result;
513 513
514 next_state_ = STATE_GENERATE_AUTH_TOKEN; 514 next_state_ = STATE_GENERATE_AUTH_TOKEN;
515 return result; 515 return result;
516 } 516 }
517 517
518 } // namespace net 518 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_pipelined_connection_impl.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698