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

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

Issue 1062413002: Remove unnecessary instrumentation for several jank bugs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile fixes Created 5 years, 8 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 | « net/quic/quic_crypto_client_stream.cc ('k') | net/socket/socks_client_socket.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/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/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/profiler/scoped_tracker.h"
12 #include "base/stl_util.h" 11 #include "base/stl_util.h"
13 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
14 #include "base/time/time.h" 13 #include "base/time/time.h"
15 #include "base/values.h" 14 #include "base/values.h"
16 #include "net/base/net_errors.h" 15 #include "net/base/net_errors.h"
17 #include "net/log/net_log.h" 16 #include "net/log/net_log.h"
18 17
19 using base::TimeDelta; 18 using base::TimeDelta;
20 19
21 namespace net { 20 namespace net {
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 *group = top_group; 856 *group = top_group;
858 *group_name = *top_group_name; 857 *group_name = *top_group_name;
859 } else { 858 } else {
860 CHECK(!has_stalled_group); 859 CHECK(!has_stalled_group);
861 } 860 }
862 return has_stalled_group; 861 return has_stalled_group;
863 } 862 }
864 863
865 void ClientSocketPoolBaseHelper::OnConnectJobComplete( 864 void ClientSocketPoolBaseHelper::OnConnectJobComplete(
866 int result, ConnectJob* job) { 865 int result, ConnectJob* job) {
867 // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
868 tracked_objects::ScopedTracker tracking_profile(
869 FROM_HERE_WITH_EXPLICIT_FUNCTION(
870 "436634 ClientSocketPoolBaseHelper::OnConnectJobComplete"));
871
872 DCHECK_NE(ERR_IO_PENDING, result); 866 DCHECK_NE(ERR_IO_PENDING, result);
873 const std::string group_name = job->group_name(); 867 const std::string group_name = job->group_name();
874 GroupMap::iterator group_it = group_map_.find(group_name); 868 GroupMap::iterator group_it = group_map_.find(group_name);
875 CHECK(group_it != group_map_.end()); 869 CHECK(group_it != group_map_.end());
876 Group* group = group_it->second; 870 Group* group = group_it->second;
877 871
878 scoped_ptr<StreamSocket> socket = job->PassSocket(); 872 scoped_ptr<StreamSocket> socket = job->PassSocket();
879 873
880 // Copies of these are needed because |job| may be deleted before they are 874 // Copies of these are needed because |job| may be deleted before they are
881 // accessed. 875 // accessed.
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
1334 pending_requests_.Erase(pointer); 1328 pending_requests_.Erase(pointer);
1335 // If there are no more requests, kill the backup timer. 1329 // If there are no more requests, kill the backup timer.
1336 if (pending_requests_.empty()) 1330 if (pending_requests_.empty())
1337 backup_job_timer_.Stop(); 1331 backup_job_timer_.Stop();
1338 return request.Pass(); 1332 return request.Pass();
1339 } 1333 }
1340 1334
1341 } // namespace internal 1335 } // namespace internal
1342 1336
1343 } // namespace net 1337 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_crypto_client_stream.cc ('k') | net/socket/socks_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698