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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 if (expected.size() < buffer->GetSize()) | 66 if (expected.size() < buffer->GetSize()) |
67 data = data.substr(0, expected.size()); | 67 data = data.substr(0, expected.size()); |
68 EXPECT_EQ(expected, data); | 68 EXPECT_EQ(expected, data); |
69 expected_data_.pop(); | 69 expected_data_.pop(); |
70 int32_t error = 0; | 70 int32_t error = 0; |
71 if (!error_to_report_.empty()) { | 71 if (!error_to_report_.empty()) { |
72 error = error_to_report_.front(); | 72 error = error_to_report_.front(); |
73 error_to_report_.pop(); | 73 error_to_report_.pop(); |
74 } | 74 } |
75 if (error) | 75 if (error) |
76 buffer->DoneWithError(data.size(), error); | 76 buffer->DoneWithError(static_cast<uint32_t>(data.size()), error); |
77 else | 77 else |
78 buffer->Done(data.size()); | 78 buffer->Done(static_cast<uint32_t>(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 std::unique_ptr<device::ReadOnlyBuffer> buffer_; | 88 std::unique_ptr<device::ReadOnlyBuffer> buffer_; |
(...skipping 115 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 |