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

Side by Side Diff: extensions/renderer/api/serial/data_receiver_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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 private: 92 private:
93 void CreateDataSource( 93 void CreateDataSource(
94 mojo::InterfaceRequest<device::serial::DataSource> request, 94 mojo::InterfaceRequest<device::serial::DataSource> request,
95 mojo::InterfacePtr<device::serial::DataSourceClient> client) { 95 mojo::InterfacePtr<device::serial::DataSourceClient> client) {
96 sender_ = new device::DataSourceSender( 96 sender_ = new device::DataSourceSender(
97 std::move(request), std::move(client), 97 std::move(request), std::move(client),
98 base::Bind(&DataReceiverTest::ReadyToSend, base::Unretained(this)), 98 base::Bind(&DataReceiverTest::ReadyToSend, base::Unretained(this)),
99 base::Bind(base::DoNothing)); 99 base::Bind(base::DoNothing));
100 } 100 }
101 101
102 void ReadyToSend(scoped_ptr<device::WritableBuffer> buffer) { 102 void ReadyToSend(std::unique_ptr<device::WritableBuffer> buffer) {
103 if (data_to_send_.empty() && error_to_send_.empty()) 103 if (data_to_send_.empty() && error_to_send_.empty())
104 return; 104 return;
105 105
106 std::string data; 106 std::string data;
107 int32_t error = 0; 107 int32_t error = 0;
108 if (!data_to_send_.empty()) { 108 if (!data_to_send_.empty()) {
109 data = data_to_send_.front(); 109 data = data_to_send_.front();
110 data_to_send_.pop(); 110 data_to_send_.pop();
111 } 111 }
112 if (!error_to_send_.empty()) { 112 if (!error_to_send_.empty()) {
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 #define MAYBE_SerializeAfterClose DISABLED_SerializeAfterClose 193 #define MAYBE_SerializeAfterClose DISABLED_SerializeAfterClose
194 #else 194 #else
195 #define MAYBE_SerializeAfterClose SerializeAfterClose 195 #define MAYBE_SerializeAfterClose SerializeAfterClose
196 #endif 196 #endif
197 TEST_F(DataReceiverTest, MAYBE_SerializeAfterClose) { 197 TEST_F(DataReceiverTest, MAYBE_SerializeAfterClose) {
198 data_to_send_.push("a"); 198 data_to_send_.push("a");
199 RunTest("data_receiver_unittest.js", "testSerializeAfterClose"); 199 RunTest("data_receiver_unittest.js", "testSerializeAfterClose");
200 } 200 }
201 201
202 } // namespace extensions 202 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698