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

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

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
« no previous file with comments | « net/socket/transport_client_socket_pool.h ('k') | net/ssl/client_cert_store.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/websocket_transport_client_socket_pool.h" 5 #include "net/socket/websocket_transport_client_socket_pool.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/numerics/safe_conversions.h" 11 #include "base/numerics/safe_conversions.h"
12 #include "base/profiler/scoped_tracker.h"
12 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
13 #include "base/time/time.h" 14 #include "base/time/time.h"
14 #include "base/values.h" 15 #include "base/values.h"
15 #include "net/base/net_errors.h" 16 #include "net/base/net_errors.h"
16 #include "net/base/net_log.h" 17 #include "net/base/net_log.h"
17 #include "net/socket/client_socket_handle.h" 18 #include "net/socket/client_socket_handle.h"
18 #include "net/socket/client_socket_pool_base.h" 19 #include "net/socket/client_socket_pool_base.h"
19 #include "net/socket/websocket_endpoint_lock_manager.h" 20 #include "net/socket/websocket_endpoint_lock_manager.h"
20 #include "net/socket/websocket_transport_connect_sub_job.h" 21 #include "net/socket/websocket_transport_connect_sub_job.h"
21 22
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 WebSocketTransportClientSocketPool::ConnectJobDelegate::ConnectJobDelegate( 624 WebSocketTransportClientSocketPool::ConnectJobDelegate::ConnectJobDelegate(
624 WebSocketTransportClientSocketPool* owner) 625 WebSocketTransportClientSocketPool* owner)
625 : owner_(owner) {} 626 : owner_(owner) {}
626 627
627 WebSocketTransportClientSocketPool::ConnectJobDelegate::~ConnectJobDelegate() {} 628 WebSocketTransportClientSocketPool::ConnectJobDelegate::~ConnectJobDelegate() {}
628 629
629 void 630 void
630 WebSocketTransportClientSocketPool::ConnectJobDelegate::OnConnectJobComplete( 631 WebSocketTransportClientSocketPool::ConnectJobDelegate::OnConnectJobComplete(
631 int result, 632 int result,
632 ConnectJob* job) { 633 ConnectJob* job) {
634 // TODO(vadimt): Remove ScopedTracker below once crbug.com/436634 is fixed.
635 tracked_objects::ScopedTracker tracking_profile(
636 FROM_HERE_WITH_EXPLICIT_FUNCTION(
637 "436634 WebSocket...::ConnectJobDelegate::OnConnectJobComplete"));
638
633 owner_->OnConnectJobComplete(result, 639 owner_->OnConnectJobComplete(result,
634 static_cast<WebSocketTransportConnectJob*>(job)); 640 static_cast<WebSocketTransportConnectJob*>(job));
635 } 641 }
636 642
637 WebSocketTransportClientSocketPool::StalledRequest::StalledRequest( 643 WebSocketTransportClientSocketPool::StalledRequest::StalledRequest(
638 const scoped_refptr<TransportSocketParams>& params, 644 const scoped_refptr<TransportSocketParams>& params,
639 RequestPriority priority, 645 RequestPriority priority,
640 ClientSocketHandle* handle, 646 ClientSocketHandle* handle,
641 const CompletionCallback& callback, 647 const CompletionCallback& callback,
642 const BoundNetLog& net_log) 648 const BoundNetLog& net_log)
643 : params(params), 649 : params(params),
644 priority(priority), 650 priority(priority),
645 handle(handle), 651 handle(handle),
646 callback(callback), 652 callback(callback),
647 net_log(net_log) {} 653 net_log(net_log) {}
648 654
649 WebSocketTransportClientSocketPool::StalledRequest::~StalledRequest() {} 655 WebSocketTransportClientSocketPool::StalledRequest::~StalledRequest() {}
650 656
651 } // namespace net 657 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/transport_client_socket_pool.h ('k') | net/ssl/client_cert_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698