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

Unified Diff: net/disk_cache/entry_unittest.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 | « net/disk_cache/disk_cache_test_util.cc ('k') | net/disk_cache/simple/simple_backend_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/disk_cache/entry_unittest.cc
diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc
index 971e719fc12f67257f6ce4b584cf2ead2d16f639..01645dc84181d6c74666a5a824685bdcd8a7db1c 100644
--- a/net/disk_cache/entry_unittest.cc
+++ b/net/disk_cache/entry_unittest.cc
@@ -2865,13 +2865,15 @@ TEST_F(DiskCacheEntryTest, SimpleCacheOptimisticWriteReleases) {
// operations. To ensure the queue is empty, we issue a write and wait until
// it completes.
EXPECT_EQ(kWriteSize,
- WriteData(entry, 0, 0, buffer1, kWriteSize, false));
+ WriteData(entry, 0, 0, buffer1.get(), kWriteSize, false));
EXPECT_TRUE(buffer1->HasOneRef());
// Finally, we should perform an optimistic write and confirm that all
// references to the IO buffer have been released.
- EXPECT_EQ(kWriteSize, entry->WriteData(
- 1, 0, buffer1, kWriteSize, net::CompletionCallback(), false));
+ EXPECT_EQ(
+ kWriteSize,
+ entry->WriteData(
+ 1, 0, buffer1.get(), kWriteSize, net::CompletionCallback(), false));
EXPECT_TRUE(buffer1->HasOneRef());
entry->Close();
}
@@ -3218,7 +3220,7 @@ TEST_F(DiskCacheEntryTest, SimpleCacheReadCombineCRC) {
ASSERT_EQ(net::OK, CreateEntry(key, &entry));
EXPECT_NE(null, entry);
- EXPECT_EQ(kSize, WriteData(entry, 0, 0, buffer1, kSize, false));
+ EXPECT_EQ(kSize, WriteData(entry, 0, 0, buffer1.get(), kSize, false));
entry->Close();
disk_cache::Entry* entry2 = NULL;
@@ -3229,14 +3231,14 @@ TEST_F(DiskCacheEntryTest, SimpleCacheReadCombineCRC) {
int offset = 0;
int buf_len = kHalfSize;
scoped_refptr<net::IOBuffer> buffer1_read1(new net::IOBuffer(buf_len));
- EXPECT_EQ(buf_len, ReadData(entry2, 0, offset, buffer1_read1, buf_len));
+ EXPECT_EQ(buf_len, ReadData(entry2, 0, offset, buffer1_read1.get(), buf_len));
EXPECT_EQ(0, memcmp(buffer1->data(), buffer1_read1->data(), buf_len));
// Read the second half of the data.
offset = buf_len;
buf_len = kHalfSize;
scoped_refptr<net::IOBuffer> buffer1_read2(new net::IOBuffer(buf_len));
- EXPECT_EQ(buf_len, ReadData(entry2, 0, offset, buffer1_read2, buf_len));
+ EXPECT_EQ(buf_len, ReadData(entry2, 0, offset, buffer1_read2.get(), buf_len));
char* buffer1_data = buffer1->data() + offset;
EXPECT_EQ(0, memcmp(buffer1_data, buffer1_read2->data(), buf_len));
@@ -3274,10 +3276,12 @@ TEST_F(DiskCacheEntryTest, SimpleCacheNonSequentialWrite) {
int offset = kHalfSize;
int buf_len = kHalfSize;
- EXPECT_EQ(buf_len, WriteData(entry, 0, offset, buffer2, buf_len, false));
+ EXPECT_EQ(buf_len,
+ WriteData(entry, 0, offset, buffer2.get(), buf_len, false));
offset = 0;
buf_len = kHalfSize;
- EXPECT_EQ(buf_len, WriteData(entry, 0, offset, buffer1, buf_len, false));
+ EXPECT_EQ(buf_len,
+ WriteData(entry, 0, offset, buffer1.get(), buf_len, false));
entry->Close();
disk_cache::Entry* entry2 = NULL;
@@ -3285,7 +3289,7 @@ TEST_F(DiskCacheEntryTest, SimpleCacheNonSequentialWrite) {
EXPECT_EQ(entry, entry2);
scoped_refptr<net::IOBuffer> buffer1_read1(new net::IOBuffer(kSize));
- EXPECT_EQ(kSize, ReadData(entry2, 0, 0, buffer1_read1, kSize));
+ EXPECT_EQ(kSize, ReadData(entry2, 0, 0, buffer1_read1.get(), kSize));
EXPECT_EQ(0, memcmp(buffer1->data(), buffer1_read1->data(), kSize));
// Check that we are not leaking.
« no previous file with comments | « net/disk_cache/disk_cache_test_util.cc ('k') | net/disk_cache/simple/simple_backend_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698