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

Unified Diff: webkit/media/buffered_resource_loader_unittest.cc

Issue 9854031: Replace size_t with int in a few media classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/media/buffered_data_source_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/buffered_resource_loader_unittest.cc
diff --git a/webkit/media/buffered_resource_loader_unittest.cc b/webkit/media/buffered_resource_loader_unittest.cc
index b99526879bda1275494d1d24d566073057ae3304..6073df217ddb16d218fe3b8b5fa7f5a63d04bf07 100644
--- a/webkit/media/buffered_resource_loader_unittest.cc
+++ b/webkit/media/buffered_resource_loader_unittest.cc
@@ -89,7 +89,7 @@ class BufferedResourceLoaderTest : public testing::Test {
loader_->SetURLLoaderForTest(scoped_ptr<WebKit::WebURLLoader>(url_loader_));
}
- void SetLoaderBuffer(size_t forward_capacity, size_t backward_capacity) {
+ void SetLoaderBuffer(int forward_capacity, int backward_capacity) {
loader_->buffer_.reset(
new media::SeekableBuffer(backward_capacity, forward_capacity));
}
@@ -213,8 +213,8 @@ class BufferedResourceLoaderTest : public testing::Test {
}
void WriteUntilThreshold() {
- size_t buffered = loader_->buffer_->forward_bytes();
- size_t capacity = loader_->buffer_->forward_capacity();
+ int buffered = loader_->buffer_->forward_bytes();
+ int capacity = loader_->buffer_->forward_capacity();
CHECK_LT(buffered, capacity);
EXPECT_CALL(*this, NetworkCallback());
@@ -242,22 +242,22 @@ class BufferedResourceLoaderTest : public testing::Test {
EXPECT_EQ(loader_->last_offset_, expected_last_offset);
}
- void ConfirmBufferState(size_t backward_bytes,
- size_t backward_capacity,
- size_t forward_bytes,
- size_t forward_capacity) {
+ void ConfirmBufferState(int backward_bytes,
+ int backward_capacity,
+ int forward_bytes,
+ int forward_capacity) {
EXPECT_EQ(backward_bytes, loader_->buffer_->backward_bytes());
EXPECT_EQ(backward_capacity, loader_->buffer_->backward_capacity());
EXPECT_EQ(forward_bytes, loader_->buffer_->forward_bytes());
EXPECT_EQ(forward_capacity, loader_->buffer_->forward_capacity());
}
- void ConfirmLoaderBufferBackwardCapacity(size_t expected_backward_capacity) {
+ void ConfirmLoaderBufferBackwardCapacity(int expected_backward_capacity) {
EXPECT_EQ(loader_->buffer_->backward_capacity(),
expected_backward_capacity);
}
- void ConfirmLoaderBufferForwardCapacity(size_t expected_forward_capacity) {
+ void ConfirmLoaderBufferForwardCapacity(int expected_forward_capacity) {
EXPECT_EQ(loader_->buffer_->forward_capacity(), expected_forward_capacity);
}
@@ -268,12 +268,12 @@ class BufferedResourceLoaderTest : public testing::Test {
// Makes sure the |loader_| buffer window is in a reasonable range.
void CheckBufferWindowBounds() {
// Corresponds to value defined in buffered_resource_loader.cc.
- static const size_t kMinBufferCapacity = 2 * 1024 * 1024;
+ static const int kMinBufferCapacity = 2 * 1024 * 1024;
EXPECT_GE(loader_->buffer_->forward_capacity(), kMinBufferCapacity);
EXPECT_GE(loader_->buffer_->backward_capacity(), kMinBufferCapacity);
// Corresponds to value defined in buffered_resource_loader.cc.
- static const size_t kMaxBufferCapacity = 20 * 1024 * 1024;
+ static const int kMaxBufferCapacity = 20 * 1024 * 1024;
EXPECT_LE(loader_->buffer_->forward_capacity(), kMaxBufferCapacity);
EXPECT_LE(loader_->buffer_->backward_capacity(), kMaxBufferCapacity);
}
@@ -283,8 +283,8 @@ class BufferedResourceLoaderTest : public testing::Test {
MOCK_METHOD0(NetworkCallback, void());
// Accessors for private variables on |loader_|.
- size_t forward_bytes() { return loader_->buffer_->forward_bytes(); }
- size_t forward_capacity() { return loader_->buffer_->forward_capacity(); }
+ int forward_bytes() { return loader_->buffer_->forward_bytes(); }
+ int forward_capacity() { return loader_->buffer_->forward_capacity(); }
protected:
GURL gurl_;
@@ -943,8 +943,8 @@ TEST_F(BufferedResourceLoaderTest, Tricky_LargeReadBackwards) {
}
TEST_F(BufferedResourceLoaderTest, Tricky_ReadPastThreshold) {
- const size_t kSize = 5 * 1024 * 1024;
- const size_t kThreshold = 2 * 1024 * 1024;
+ const int kSize = 5 * 1024 * 1024;
+ const int kThreshold = 2 * 1024 * 1024;
Initialize(kHttpUrl, 10, kSize);
SetLoaderBuffer(10, 10);
« no previous file with comments | « webkit/media/buffered_data_source_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698