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

Side by Side Diff: extensions/renderer/api/serial/data_sender_unittest.cc

Issue 1899083003: Convert //extensions/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 8 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
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 <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
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
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
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
OLDNEW
« no previous file with comments | « extensions/renderer/api/serial/data_receiver_unittest.cc ('k') | extensions/renderer/api/serial/serial_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698