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

Side by Side Diff: chrome/browser/devtools/device/usb/android_usb_socket.cc

Issue 2913693002: Replace deprecated base::NonThreadSafe in chrome/browser/devtools in favor of SequenceChecker. (Closed)
Patch Set: Created 3 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 | « chrome/browser/devtools/device/usb/android_usb_socket.h ('k') | 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 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 "chrome/browser/devtools/device/usb/android_usb_socket.h" 5 #include "chrome/browser/devtools/device/usb/android_usb_socket.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 14 matching lines...) Expand all
25 base::Closure delete_callback) 25 base::Closure delete_callback)
26 : device_(device), 26 : device_(device),
27 command_(command), 27 command_(command),
28 local_id_(socket_id), 28 local_id_(socket_id),
29 remote_id_(0), 29 remote_id_(0),
30 is_connected_(false), 30 is_connected_(false),
31 delete_callback_(delete_callback), 31 delete_callback_(delete_callback),
32 weak_factory_(this) {} 32 weak_factory_(this) {}
33 33
34 AndroidUsbSocket::~AndroidUsbSocket() { 34 AndroidUsbSocket::~AndroidUsbSocket() {
35 DCHECK(CalledOnValidThread()); 35 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
36 if (is_connected_) 36 if (is_connected_)
37 Disconnect(); 37 Disconnect();
38 if (!delete_callback_.is_null()) 38 if (!delete_callback_.is_null())
39 delete_callback_.Run(); 39 delete_callback_.Run();
40 } 40 }
41 41
42 void AndroidUsbSocket::HandleIncoming(std::unique_ptr<AdbMessage> message) { 42 void AndroidUsbSocket::HandleIncoming(std::unique_ptr<AdbMessage> message) {
43 if (!device_.get()) 43 if (!device_.get())
44 return; 44 return;
45 45
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 NOTIMPLEMENTED(); 155 NOTIMPLEMENTED();
156 return net::ERR_NOT_IMPLEMENTED; 156 return net::ERR_NOT_IMPLEMENTED;
157 } 157 }
158 158
159 int AndroidUsbSocket::SetSendBufferSize(int32_t size) { 159 int AndroidUsbSocket::SetSendBufferSize(int32_t size) {
160 NOTIMPLEMENTED(); 160 NOTIMPLEMENTED();
161 return net::ERR_NOT_IMPLEMENTED; 161 return net::ERR_NOT_IMPLEMENTED;
162 } 162 }
163 163
164 int AndroidUsbSocket::Connect(const net::CompletionCallback& callback) { 164 int AndroidUsbSocket::Connect(const net::CompletionCallback& callback) {
165 DCHECK(CalledOnValidThread()); 165 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
166 DCHECK(!callback.is_null()); 166 DCHECK(!callback.is_null());
167 if (!device_.get()) 167 if (!device_.get())
168 return net::ERR_FAILED; 168 return net::ERR_FAILED;
169 169
170 DCHECK(!is_connected_); 170 DCHECK(!is_connected_);
171 DCHECK(connect_callback_.is_null()); 171 DCHECK(connect_callback_.is_null());
172 connect_callback_ = callback; 172 connect_callback_ = callback;
173 device_->Send(AdbMessage::kCommandOPEN, local_id_, 0, command_); 173 device_->Send(AdbMessage::kCommandOPEN, local_id_, 0, command_);
174 return net::ERR_IO_PENDING; 174 return net::ERR_IO_PENDING;
175 } 175 }
176 176
177 void AndroidUsbSocket::Disconnect() { 177 void AndroidUsbSocket::Disconnect() {
178 if (!device_.get()) 178 if (!device_.get())
179 return; 179 return;
180 device_->Send(AdbMessage::kCommandCLSE, local_id_, remote_id_, ""); 180 device_->Send(AdbMessage::kCommandCLSE, local_id_, remote_id_, "");
181 Terminated(false); 181 Terminated(false);
182 } 182 }
183 183
184 bool AndroidUsbSocket::IsConnected() const { 184 bool AndroidUsbSocket::IsConnected() const {
185 DCHECK(CalledOnValidThread()); 185 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
186 return is_connected_; 186 return is_connected_;
187 } 187 }
188 188
189 bool AndroidUsbSocket::IsConnectedAndIdle() const { 189 bool AndroidUsbSocket::IsConnectedAndIdle() const {
190 NOTIMPLEMENTED(); 190 NOTIMPLEMENTED();
191 return false; 191 return false;
192 } 192 }
193 193
194 int AndroidUsbSocket::GetPeerAddress(net::IPEndPoint* address) const { 194 int AndroidUsbSocket::GetPeerAddress(net::IPEndPoint* address) const {
195 *address = net::IPEndPoint(net::IPAddress(0, 0, 0, 0), 0); 195 *address = net::IPEndPoint(net::IPAddress(0, 0, 0, 0), 0);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 read_buffer_ = read_buffer_.substr(bytes_to_copy); 253 read_buffer_ = read_buffer_.substr(bytes_to_copy);
254 else 254 else
255 read_buffer_ = std::string(); 255 read_buffer_ = std::string();
256 base::ResetAndReturn(&read_callback_).Run(bytes_to_copy); 256 base::ResetAndReturn(&read_callback_).Run(bytes_to_copy);
257 } 257 }
258 258
259 void AndroidUsbSocket::RespondToWriter(int result) { 259 void AndroidUsbSocket::RespondToWriter(int result) {
260 if (!write_callback_.is_null()) 260 if (!write_callback_.is_null())
261 base::ResetAndReturn(&write_callback_).Run(result); 261 base::ResetAndReturn(&write_callback_).Run(result);
262 } 262 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/device/usb/android_usb_socket.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698