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

Side by Side Diff: media/blink/buffered_resource_loader_unittest.cc

Issue 1904253002: Convert //media/blink from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « media/blink/buffered_resource_loader.cc ('k') | media/blink/cdm_session_adapter.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 last_position_ = last_position; 88 last_position_ = last_position;
89 89
90 loader_.reset(new BufferedResourceLoader( 90 loader_.reset(new BufferedResourceLoader(
91 gurl_, BufferedResourceLoader::kUnspecified, 91 gurl_, BufferedResourceLoader::kUnspecified,
92 first_position_, last_position_, 92 first_position_, last_position_,
93 BufferedResourceLoader::kCapacityDefer, 0, 0, 93 BufferedResourceLoader::kCapacityDefer, 0, 0,
94 new MediaLog())); 94 new MediaLog()));
95 95
96 // |test_loader_| will be used when Start() is called. 96 // |test_loader_| will be used when Start() is called.
97 url_loader_ = new NiceMock<MockWebURLLoader>(); 97 url_loader_ = new NiceMock<MockWebURLLoader>();
98 loader_->test_loader_ = scoped_ptr<blink::WebURLLoader>(url_loader_); 98 loader_->test_loader_ = std::unique_ptr<blink::WebURLLoader>(url_loader_);
99 } 99 }
100 100
101 void SetLoaderBuffer(int forward_capacity, int backward_capacity) { 101 void SetLoaderBuffer(int forward_capacity, int backward_capacity) {
102 loader_->buffer_.set_forward_capacity(forward_capacity); 102 loader_->buffer_.set_forward_capacity(forward_capacity);
103 loader_->buffer_.set_backward_capacity(backward_capacity); 103 loader_->buffer_.set_backward_capacity(backward_capacity);
104 loader_->buffer_.Clear(); 104 loader_->buffer_.Clear();
105 } 105 }
106 106
107 void Start() { 107 void Start() {
108 InSequence s; 108 InSequence s;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 EXPECT_CALL(*this, ProgressCallback(position + size - 1)); 218 EXPECT_CALL(*this, ProgressCallback(position + size - 1));
219 loader_->didReceiveData(url_loader_, 219 loader_->didReceiveData(url_loader_,
220 reinterpret_cast<char*>(data_ + position), 220 reinterpret_cast<char*>(data_ + position),
221 size, 221 size,
222 size); 222 size);
223 } 223 }
224 224
225 void WriteData(int size) { 225 void WriteData(int size) {
226 EXPECT_CALL(*this, ProgressCallback(_)); 226 EXPECT_CALL(*this, ProgressCallback(_));
227 227
228 scoped_ptr<char[]> data(new char[size]); 228 std::unique_ptr<char[]> data(new char[size]);
229 loader_->didReceiveData(url_loader_, data.get(), size, size); 229 loader_->didReceiveData(url_loader_, data.get(), size, size);
230 } 230 }
231 231
232 void WriteUntilThreshold() { 232 void WriteUntilThreshold() {
233 int buffered = loader_->buffer_.forward_bytes(); 233 int buffered = loader_->buffer_.forward_bytes();
234 int capacity = loader_->buffer_.forward_capacity(); 234 int capacity = loader_->buffer_.forward_capacity();
235 CHECK_LT(buffered, capacity); 235 CHECK_LT(buffered, capacity);
236 236
237 EXPECT_CALL(*this, LoadingCallback( 237 EXPECT_CALL(*this, LoadingCallback(
238 BufferedResourceLoader::kLoadingDeferred)); 238 BufferedResourceLoader::kLoadingDeferred));
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 MOCK_METHOD1(StartCallback, void(BufferedResourceLoader::Status)); 297 MOCK_METHOD1(StartCallback, void(BufferedResourceLoader::Status));
298 MOCK_METHOD2(ReadCallback, void(BufferedResourceLoader::Status, int)); 298 MOCK_METHOD2(ReadCallback, void(BufferedResourceLoader::Status, int));
299 MOCK_METHOD1(LoadingCallback, void(BufferedResourceLoader::LoadingState)); 299 MOCK_METHOD1(LoadingCallback, void(BufferedResourceLoader::LoadingState));
300 MOCK_METHOD1(ProgressCallback, void(int64_t)); 300 MOCK_METHOD1(ProgressCallback, void(int64_t));
301 301
302 protected: 302 protected:
303 GURL gurl_; 303 GURL gurl_;
304 int64_t first_position_; 304 int64_t first_position_;
305 int64_t last_position_; 305 int64_t last_position_;
306 306
307 scoped_ptr<BufferedResourceLoader> loader_; 307 std::unique_ptr<BufferedResourceLoader> loader_;
308 NiceMock<MockWebURLLoader>* url_loader_; 308 NiceMock<MockWebURLLoader>* url_loader_;
309 309
310 MockWebFrameClient client_; 310 MockWebFrameClient client_;
311 WebView* view_; 311 WebView* view_;
312 WebLocalFrame* frame_; 312 WebLocalFrame* frame_;
313 313
314 base::MessageLoop message_loop_; 314 base::MessageLoop message_loop_;
315 315
316 uint8_t data_[kDataSize]; 316 uint8_t data_[kDataSize];
317 317
(...skipping 845 matching lines...) Expand 10 before | Expand all | Expand 10 after
1163 1163
1164 // As soon as we have received enough data to fulfill the read, defer. 1164 // As soon as we have received enough data to fulfill the read, defer.
1165 EXPECT_CALL(*this, LoadingCallback(BufferedResourceLoader::kLoadingDeferred)); 1165 EXPECT_CALL(*this, LoadingCallback(BufferedResourceLoader::kLoadingDeferred));
1166 EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 10)); 1166 EXPECT_CALL(*this, ReadCallback(BufferedResourceLoader::kOk, 10));
1167 WriteLoader(19, 1); 1167 WriteLoader(19, 1);
1168 VerifyBuffer(buffer, 10, 10); 1168 VerifyBuffer(buffer, 10, 10);
1169 EXPECT_FALSE(HasActiveLoader()); 1169 EXPECT_FALSE(HasActiveLoader());
1170 } 1170 }
1171 1171
1172 } // namespace media 1172 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/buffered_resource_loader.cc ('k') | media/blink/cdm_session_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698