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

Side by Side Diff: blimp/net/tcp_engine_transport.cc

Issue 2034703003: Remove use of deprecated MessageLoop methods in blimp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « blimp/net/stream_packet_writer.cc ('k') | blimp/net/thread_pipe_manager_unittest.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "blimp/net/tcp_engine_transport.h" 5 #include "blimp/net/tcp_engine_transport.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
11 #include "base/location.h"
11 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
12 #include "base/message_loop/message_loop.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/threading/thread_task_runner_handle.h"
13 #include "blimp/net/stream_socket_connection.h" 15 #include "blimp/net/stream_socket_connection.h"
14 #include "net/socket/stream_socket.h" 16 #include "net/socket/stream_socket.h"
15 #include "net/socket/tcp_server_socket.h" 17 #include "net/socket/tcp_server_socket.h"
16 18
17 namespace blimp { 19 namespace blimp {
18 20
19 TCPEngineTransport::TCPEngineTransport(const net::IPEndPoint& address, 21 TCPEngineTransport::TCPEngineTransport(const net::IPEndPoint& address,
20 BlimpConnectionStatistics* statistics, 22 BlimpConnectionStatistics* statistics,
21 net::NetLog* net_log) 23 net::NetLog* net_log)
22 : address_(address), 24 : address_(address),
23 blimp_connection_statistics_(statistics), 25 blimp_connection_statistics_(statistics),
24 net_log_(net_log) { 26 net_log_(net_log) {
25 DCHECK(blimp_connection_statistics_); 27 DCHECK(blimp_connection_statistics_);
26 } 28 }
27 29
28 TCPEngineTransport::~TCPEngineTransport() {} 30 TCPEngineTransport::~TCPEngineTransport() {}
29 31
30 void TCPEngineTransport::Connect(const net::CompletionCallback& callback) { 32 void TCPEngineTransport::Connect(const net::CompletionCallback& callback) {
31 DCHECK(!accepted_socket_); 33 DCHECK(!accepted_socket_);
32 DCHECK(!callback.is_null()); 34 DCHECK(!callback.is_null());
33 35
34 if (!server_socket_) { 36 if (!server_socket_) {
35 server_socket_.reset( 37 server_socket_.reset(
36 new net::TCPServerSocket(net_log_, net::NetLog::Source())); 38 new net::TCPServerSocket(net_log_, net::NetLog::Source()));
37 int result = server_socket_->Listen(address_, 5); 39 int result = server_socket_->Listen(address_, 5);
38 if (result != net::OK) { 40 if (result != net::OK) {
39 server_socket_.reset(); 41 server_socket_.reset();
40 base::MessageLoop::current()->PostTask(FROM_HERE, 42 base::ThreadTaskRunnerHandle::Get()->PostTask(
41 base::Bind(callback, result)); 43 FROM_HERE, base::Bind(callback, result));
42 return; 44 return;
43 } 45 }
44 } 46 }
45 47
46 net::CompletionCallback accept_callback = base::Bind( 48 net::CompletionCallback accept_callback = base::Bind(
47 &TCPEngineTransport::OnTCPConnectAccepted, base::Unretained(this)); 49 &TCPEngineTransport::OnTCPConnectAccepted, base::Unretained(this));
48 50
49 int result = server_socket_->Accept(&accepted_socket_, accept_callback); 51 int result = server_socket_->Accept(&accepted_socket_, accept_callback);
50 if (result == net::ERR_IO_PENDING) { 52 if (result == net::ERR_IO_PENDING) {
51 connect_callback_ = callback; 53 connect_callback_ = callback;
52 return; 54 return;
53 } 55 }
54 56
55 if (result != net::OK) { 57 if (result != net::OK) {
56 // TODO(haibinlu): investigate when we can keep using this server socket. 58 // TODO(haibinlu): investigate when we can keep using this server socket.
57 server_socket_.reset(); 59 server_socket_.reset();
58 } 60 }
59 61
60 base::MessageLoop::current()->PostTask(FROM_HERE, 62 base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
61 base::Bind(callback, result)); 63 base::Bind(callback, result));
62 } 64 }
63 65
64 std::unique_ptr<BlimpConnection> TCPEngineTransport::TakeConnection() { 66 std::unique_ptr<BlimpConnection> TCPEngineTransport::TakeConnection() {
65 DCHECK(connect_callback_.is_null()); 67 DCHECK(connect_callback_.is_null());
66 DCHECK(accepted_socket_); 68 DCHECK(accepted_socket_);
67 return base::WrapUnique(new StreamSocketConnection( 69 return base::WrapUnique(new StreamSocketConnection(
68 std::move(accepted_socket_), blimp_connection_statistics_)); 70 std::move(accepted_socket_), blimp_connection_statistics_));
69 } 71 }
70 72
71 const char* TCPEngineTransport::GetName() const { 73 const char* TCPEngineTransport::GetName() const {
72 return "TCP"; 74 return "TCP";
73 } 75 }
74 76
75 int TCPEngineTransport::GetLocalAddress(net::IPEndPoint* address) const { 77 int TCPEngineTransport::GetLocalAddress(net::IPEndPoint* address) const {
76 DCHECK(server_socket_); 78 DCHECK(server_socket_);
77 return server_socket_->GetLocalAddress(address); 79 return server_socket_->GetLocalAddress(address);
78 } 80 }
79 81
80 void TCPEngineTransport::OnTCPConnectAccepted(int result) { 82 void TCPEngineTransport::OnTCPConnectAccepted(int result) {
81 DCHECK_NE(net::ERR_IO_PENDING, result); 83 DCHECK_NE(net::ERR_IO_PENDING, result);
82 DCHECK(accepted_socket_); 84 DCHECK(accepted_socket_);
83 if (result != net::OK) { 85 if (result != net::OK) {
84 accepted_socket_.reset(); 86 accepted_socket_.reset();
85 } 87 }
86 base::ResetAndReturn(&connect_callback_).Run(result); 88 base::ResetAndReturn(&connect_callback_).Run(result);
87 } 89 }
88 90
89 } // namespace blimp 91 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/net/stream_packet_writer.cc ('k') | blimp/net/thread_pipe_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698