OLD | NEW |
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/socket/transport_client_socket_pool.h" | 5 #include "net/socket/transport_client_socket_pool.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 default: | 247 default: |
248 NOTREACHED(); | 248 NOTREACHED(); |
249 rv = ERR_FAILED; | 249 rv = ERR_FAILED; |
250 break; | 250 break; |
251 } | 251 } |
252 } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE); | 252 } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE); |
253 | 253 |
254 return rv; | 254 return rv; |
255 } | 255 } |
256 int TransportConnectJob::DoResolveHost() { | 256 int TransportConnectJob::DoResolveHost() { |
257 // TODO(ricea): Remove ScopedTracker below once crbug.com/436634 is fixed. | |
258 tracked_objects::ScopedTracker tracking_profile( | |
259 FROM_HERE_WITH_EXPLICIT_FUNCTION( | |
260 "436634 TransportConnectJob::DoResolveHost")); | |
261 | |
262 next_state_ = STATE_RESOLVE_HOST_COMPLETE; | 257 next_state_ = STATE_RESOLVE_HOST_COMPLETE; |
263 connect_timing_.dns_start = base::TimeTicks::Now(); | 258 connect_timing_.dns_start = base::TimeTicks::Now(); |
264 | 259 |
265 return resolver_->Resolve( | 260 return resolver_->Resolve( |
266 params_->destination(), priority(), &addresses_, | 261 params_->destination(), priority(), &addresses_, |
267 base::Bind(&TransportConnectJob::OnIOComplete, base::Unretained(this)), | 262 base::Bind(&TransportConnectJob::OnIOComplete, base::Unretained(this)), |
268 &request_, net_log()); | 263 &request_, net_log()); |
269 } | 264 } |
270 | 265 |
271 int TransportConnectJob::DoResolveHostComplete(int result) { | 266 int TransportConnectJob::DoResolveHostComplete(int result) { |
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
608 HigherLayeredPool* higher_pool) { | 603 HigherLayeredPool* higher_pool) { |
609 base_.AddHigherLayeredPool(higher_pool); | 604 base_.AddHigherLayeredPool(higher_pool); |
610 } | 605 } |
611 | 606 |
612 void TransportClientSocketPool::RemoveHigherLayeredPool( | 607 void TransportClientSocketPool::RemoveHigherLayeredPool( |
613 HigherLayeredPool* higher_pool) { | 608 HigherLayeredPool* higher_pool) { |
614 base_.RemoveHigherLayeredPool(higher_pool); | 609 base_.RemoveHigherLayeredPool(higher_pool); |
615 } | 610 } |
616 | 611 |
617 } // namespace net | 612 } // namespace net |
OLD | NEW |