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

Side by Side Diff: net/socket/client_socket_pool_base.cc

Issue 3013001: Fix bad merge in ClientSocketPoolBaseHelper. (Closed)
Patch Set: Created 10 years, 5 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
« no previous file with comments | « no previous file | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/client_socket_pool_base.h" 5 #include "net/socket/client_socket_pool_base.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/format_macros.h" 8 #include "base/format_macros.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/stats_counters.h" 10 #include "base/stats_counters.h"
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 LogBoundConnectJobToRequest(job_log.source(), r.get()); 620 LogBoundConnectJobToRequest(job_log.source(), r.get());
621 job->GetAdditionalErrorState(r->handle()); 621 job->GetAdditionalErrorState(r->handle());
622 RemoveConnectJob(job, &group); 622 RemoveConnectJob(job, &group);
623 if (socket.get()) { 623 if (socket.get()) {
624 handed_out_socket = true; 624 handed_out_socket = true;
625 HandOutSocket(socket.release(), false /* unused socket */, r->handle(), 625 HandOutSocket(socket.release(), false /* unused socket */, r->handle(),
626 base::TimeDelta(), &group, r->net_log()); 626 base::TimeDelta(), &group, r->net_log());
627 } 627 }
628 r->net_log().EndEvent(NetLog::TYPE_SOCKET_POOL, 628 r->net_log().EndEvent(NetLog::TYPE_SOCKET_POOL,
629 new NetLogIntegerParameter("net_error", result)); 629 new NetLogIntegerParameter("net_error", result));
630 if (socket.get()) {
631 handed_out_socket = true;
632 HandOutSocket(
633 socket.release(), false /* unused socket */, r->handle(),
634 base::TimeDelta(), &group, r->net_log());
635 }
636 r->callback()->Run(result); 630 r->callback()->Run(result);
637 } else { 631 } else {
638 RemoveConnectJob(job, &group); 632 RemoveConnectJob(job, &group);
639 } 633 }
640 if (!handed_out_socket) 634 if (!handed_out_socket)
641 OnAvailableSocketSlot(group_name, MayHaveStalledGroups()); 635 OnAvailableSocketSlot(group_name, MayHaveStalledGroups());
642 } 636 }
643 } 637 }
644 638
645 void ClientSocketPoolBaseHelper::OnIPAddressChanged() { 639 void ClientSocketPoolBaseHelper::OnIPAddressChanged() {
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 return; 796 return;
803 } 797 }
804 } 798 }
805 799
806 LOG(DFATAL) << "No idle socket found to close!."; 800 LOG(DFATAL) << "No idle socket found to close!.";
807 } 801 }
808 802
809 } // namespace internal 803 } // namespace internal
810 804
811 } // namespace net 805 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698