OLD | NEW |
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 <stdint.h> | 5 #include <stdint.h> |
6 | 6 |
7 #include <queue> | 7 #include <queue> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 private: | 42 private: |
43 void CreateDataSink( | 43 void CreateDataSink( |
44 mojo::InterfaceRequest<device::serial::DataSink> request) { | 44 mojo::InterfaceRequest<device::serial::DataSink> request) { |
45 receiver_ = new device::DataSinkReceiver( | 45 receiver_ = new device::DataSinkReceiver( |
46 std::move(request), | 46 std::move(request), |
47 base::Bind(&DataSenderTest::ReadyToReceive, base::Unretained(this)), | 47 base::Bind(&DataSenderTest::ReadyToReceive, base::Unretained(this)), |
48 base::Bind(&DataSenderTest::OnCancel, base::Unretained(this)), | 48 base::Bind(&DataSenderTest::OnCancel, base::Unretained(this)), |
49 base::Bind(base::DoNothing)); | 49 base::Bind(base::DoNothing)); |
50 } | 50 } |
51 | 51 |
52 void ReadyToReceive(scoped_ptr<device::ReadOnlyBuffer> buffer) { | 52 void ReadyToReceive(std::unique_ptr<device::ReadOnlyBuffer> buffer) { |
53 std::string data(buffer->GetData(), buffer->GetSize()); | 53 std::string data(buffer->GetData(), buffer->GetSize()); |
54 if (expected_data_.empty()) { | 54 if (expected_data_.empty()) { |
55 buffer_ = std::move(buffer); | 55 buffer_ = std::move(buffer); |
56 return; | 56 return; |
57 } | 57 } |
58 | 58 |
59 std::string& expected = expected_data_.front(); | 59 std::string& expected = expected_data_.front(); |
60 if (expected.size() > buffer->GetSize()) { | 60 if (expected.size() > buffer->GetSize()) { |
61 EXPECT_EQ(expected.substr(0, buffer->GetSize()), data); | 61 EXPECT_EQ(expected.substr(0, buffer->GetSize()), data); |
62 expected = expected.substr(buffer->GetSize()); | 62 expected = expected.substr(buffer->GetSize()); |
(...skipping 15 matching lines...) Expand all Loading... |
78 buffer->Done(data.size()); | 78 buffer->Done(data.size()); |
79 } | 79 } |
80 | 80 |
81 void OnCancel(int32_t error) { | 81 void OnCancel(int32_t error) { |
82 ASSERT_TRUE(buffer_); | 82 ASSERT_TRUE(buffer_); |
83 buffer_->DoneWithError(0, error); | 83 buffer_->DoneWithError(0, error); |
84 buffer_.reset(); | 84 buffer_.reset(); |
85 } | 85 } |
86 | 86 |
87 scoped_refptr<device::DataSinkReceiver> receiver_; | 87 scoped_refptr<device::DataSinkReceiver> receiver_; |
88 scoped_ptr<device::ReadOnlyBuffer> buffer_; | 88 std::unique_ptr<device::ReadOnlyBuffer> buffer_; |
89 | 89 |
90 DISALLOW_COPY_AND_ASSIGN(DataSenderTest); | 90 DISALLOW_COPY_AND_ASSIGN(DataSenderTest); |
91 }; | 91 }; |
92 | 92 |
93 TEST_F(DataSenderTest, Send) { | 93 TEST_F(DataSenderTest, Send) { |
94 expected_data_.push("aa"); | 94 expected_data_.push("aa"); |
95 RunTest("data_sender_unittest.js", "testSend"); | 95 RunTest("data_sender_unittest.js", "testSend"); |
96 } | 96 } |
97 | 97 |
98 // https://crbug.com/599898 | 98 // https://crbug.com/599898 |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 #if defined(LEAK_SANITIZER) | 204 #if defined(LEAK_SANITIZER) |
205 #define MAYBE_SerializeAfterClose DISABLED_SerializeAfterClose | 205 #define MAYBE_SerializeAfterClose DISABLED_SerializeAfterClose |
206 #else | 206 #else |
207 #define MAYBE_SerializeAfterClose SerializeAfterClose | 207 #define MAYBE_SerializeAfterClose SerializeAfterClose |
208 #endif | 208 #endif |
209 TEST_F(DataSenderTest, MAYBE_SerializeAfterClose) { | 209 TEST_F(DataSenderTest, MAYBE_SerializeAfterClose) { |
210 RunTest("data_sender_unittest.js", "testSerializeAfterClose"); | 210 RunTest("data_sender_unittest.js", "testSerializeAfterClose"); |
211 } | 211 } |
212 | 212 |
213 } // namespace extensions | 213 } // namespace extensions |
OLD | NEW |