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

Side by Side Diff: device/serial/data_sink_unittest.cc

Issue 1544323002: Convert Pass()→std::move() in //device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 | « device/serial/data_sink_receiver.cc ('k') | device/serial/data_source_sender.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 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 #include <utility>
7 8
8 #include "base/bind.h" 9 #include "base/bind.h"
9 #include "base/macros.h" 10 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
11 #include "base/run_loop.h" 12 #include "base/run_loop.h"
12 #include "base/strings/string_piece.h" 13 #include "base/strings/string_piece.h"
13 #include "device/serial/data_sender.h" 14 #include "device/serial/data_sender.h"
14 #include "device/serial/data_sink_receiver.h" 15 #include "device/serial/data_sink_receiver.h"
15 #include "device/serial/data_stream.mojom.h" 16 #include "device/serial/data_stream.mojom.h"
16 #include "mojo/public/cpp/bindings/interface_ptr.h" 17 #include "mojo/public/cpp/bindings/interface_ptr.h"
(...skipping 23 matching lines...) Expand all
40 expected_event_(EVENT_NONE) {} 41 expected_event_(EVENT_NONE) {}
41 42
42 void SetUp() override { 43 void SetUp() override {
43 message_loop_.reset(new base::MessageLoop); 44 message_loop_.reset(new base::MessageLoop);
44 mojo::InterfacePtr<serial::DataSink> sink_handle; 45 mojo::InterfacePtr<serial::DataSink> sink_handle;
45 sink_receiver_ = new DataSinkReceiver( 46 sink_receiver_ = new DataSinkReceiver(
46 mojo::GetProxy(&sink_handle), 47 mojo::GetProxy(&sink_handle),
47 base::Bind(&DataSinkTest::OnDataToRead, base::Unretained(this)), 48 base::Bind(&DataSinkTest::OnDataToRead, base::Unretained(this)),
48 base::Bind(&DataSinkTest::OnCancel, base::Unretained(this)), 49 base::Bind(&DataSinkTest::OnCancel, base::Unretained(this)),
49 base::Bind(&DataSinkTest::OnError, base::Unretained(this))); 50 base::Bind(&DataSinkTest::OnError, base::Unretained(this)));
50 sender_.reset(new DataSender(sink_handle.Pass(), kBufferSize, kFatalError)); 51 sender_.reset(
52 new DataSender(std::move(sink_handle), kBufferSize, kFatalError));
51 } 53 }
52 54
53 void TearDown() override { 55 void TearDown() override {
54 read_buffer_.reset(); 56 read_buffer_.reset();
55 message_loop_.reset(); 57 message_loop_.reset();
56 if (sink_receiver_.get()) 58 if (sink_receiver_.get())
57 EXPECT_TRUE(sink_receiver_->HasOneRef()); 59 EXPECT_TRUE(sink_receiver_->HasOneRef());
58 } 60 }
59 61
60 void WaitForEvent(Event event) { 62 void WaitForEvent(Event event) {
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 } 153 }
152 154
153 void OnSendError(uint32_t bytes_sent, int32_t error) { 155 void OnSendError(uint32_t bytes_sent, int32_t error) {
154 bytes_sent_ = bytes_sent; 156 bytes_sent_ = bytes_sent;
155 send_error_ = error; 157 send_error_ = error;
156 has_send_error_ = true; 158 has_send_error_ = true;
157 EventReceived(EVENT_SEND_ERROR); 159 EventReceived(EVENT_SEND_ERROR);
158 } 160 }
159 161
160 void OnDataToRead(scoped_ptr<ReadOnlyBuffer> buffer) { 162 void OnDataToRead(scoped_ptr<ReadOnlyBuffer> buffer) {
161 read_buffer_ = buffer.Pass(); 163 read_buffer_ = std::move(buffer);
162 read_buffer_contents_ = 164 read_buffer_contents_ =
163 std::string(read_buffer_->GetData(), read_buffer_->GetSize()); 165 std::string(read_buffer_->GetData(), read_buffer_->GetSize());
164 EventReceived(EVENT_READ_BUFFER_READY); 166 EventReceived(EVENT_READ_BUFFER_READY);
165 } 167 }
166 168
167 bool Cancel(int32_t error) { 169 bool Cancel(int32_t error) {
168 return sender_->Cancel( 170 return sender_->Cancel(
169 error, base::Bind(&DataSinkTest::CancelAck, base::Unretained(this))); 171 error, base::Bind(&DataSinkTest::CancelAck, base::Unretained(this)));
170 } 172 }
171 173
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 sender_.reset(); 409 sender_.reset();
408 ExpectSendError(0, kFatalError); 410 ExpectSendError(0, kFatalError);
409 ExpectSendError(0, kFatalError); 411 ExpectSendError(0, kFatalError);
410 ExpectCancelResult(); 412 ExpectCancelResult();
411 if (!seen_connection_error_) 413 if (!seen_connection_error_)
412 WaitForEvent(EVENT_ERROR); 414 WaitForEvent(EVENT_ERROR);
413 EXPECT_TRUE(seen_connection_error_); 415 EXPECT_TRUE(seen_connection_error_);
414 } 416 }
415 417
416 } // namespace device 418 } // namespace device
OLDNEW
« no previous file with comments | « device/serial/data_sink_receiver.cc ('k') | device/serial/data_source_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698