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

Side by Side Diff: net/socket/transport_client_socket_pool.h

Issue 812543002: Update from https://crrev.com/308331 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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
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 #ifndef NET_SOCKET_TRANSPORT_CLIENT_SOCKET_POOL_H_ 5 #ifndef NET_SOCKET_TRANSPORT_CLIENT_SOCKET_POOL_H_
6 #define NET_SOCKET_TRANSPORT_CLIENT_SOCKET_POOL_H_ 6 #define NET_SOCKET_TRANSPORT_CLIENT_SOCKET_POOL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 } 319 }
320 320
321 template <class T> 321 template <class T>
322 void TransportConnectJobHelper::OnIOComplete(T* job, int result) { 322 void TransportConnectJobHelper::OnIOComplete(T* job, int result) {
323 // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed. 323 // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
324 tracked_objects::ScopedTracker tracking_profile( 324 tracked_objects::ScopedTracker tracking_profile(
325 FROM_HERE_WITH_EXPLICIT_FUNCTION( 325 FROM_HERE_WITH_EXPLICIT_FUNCTION(
326 "436634 TransportConnectJobHelper::OnIOComplete")); 326 "436634 TransportConnectJobHelper::OnIOComplete"));
327 327
328 result = this->DoLoop(job, result); 328 result = this->DoLoop(job, result);
329
330 // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
331 tracked_objects::ScopedTracker tracking_profile1(
332 FROM_HERE_WITH_EXPLICIT_FUNCTION(
333 "436634 TransportConnectJobHelper::OnIOComplete1"));
334
329 if (result != ERR_IO_PENDING) 335 if (result != ERR_IO_PENDING)
330 job->NotifyDelegateOfCompletion(result); // Deletes |job| and |this| 336 job->NotifyDelegateOfCompletion(result); // Deletes |job| and |this|
331 } 337 }
332 338
333 template <class T> 339 template <class T>
334 int TransportConnectJobHelper::DoLoop(T* job, int result) { 340 int TransportConnectJobHelper::DoLoop(T* job, int result) {
335 DCHECK_NE(next_state_, STATE_NONE); 341 DCHECK_NE(next_state_, STATE_NONE);
336 342
337 int rv = result; 343 int rv = result;
338 do { 344 do {
(...skipping 20 matching lines...) Expand all
359 break; 365 break;
360 } 366 }
361 } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE); 367 } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE);
362 368
363 return rv; 369 return rv;
364 } 370 }
365 371
366 } // namespace net 372 } // namespace net
367 373
368 #endif // NET_SOCKET_TRANSPORT_CLIENT_SOCKET_POOL_H_ 374 #endif // NET_SOCKET_TRANSPORT_CLIENT_SOCKET_POOL_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | net/socket/websocket_transport_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698