Index: net/disk_cache/entry_unittest.cc |
diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc |
index 3612fab63bfd632254448f65b20c6e242dbc77af..50c7c7b9a0f5111fed9ef6abd41ef3582e126d5c 100644 |
--- a/net/disk_cache/entry_unittest.cc |
+++ b/net/disk_cache/entry_unittest.cc |
@@ -2708,7 +2708,7 @@ TEST_F(DiskCacheEntryTest, SimpleCacheNoEOF) { |
SetSimpleCacheMode(); |
InitCache(); |
- const char key[] = "the first key"; |
+ const std::string key("the first key"); |
disk_cache::Entry* entry = NULL; |
ASSERT_EQ(net::OK, CreateEntry(key, &entry)); |
@@ -2728,9 +2728,8 @@ TEST_F(DiskCacheEntryTest, SimpleCacheNoEOF) { |
int kTruncationBytes = -static_cast<int>(sizeof(disk_cache::SimpleFileEOF)); |
const base::FilePath entry_path = cache_path_.AppendASCII( |
disk_cache::simple_util::GetFilenameFromKeyAndFileIndex(key, 0)); |
- const int64_t invalid_size = |
- disk_cache::simple_util::GetFileSizeFromKeyAndDataSize(key, |
- kTruncationBytes); |
+ const int64_t invalid_size = disk_cache::simple_util::GetFileSizeFromDataSize( |
+ key.size(), kTruncationBytes); |
EXPECT_TRUE(TruncatePath(entry_path, invalid_size)); |
EXPECT_EQ(net::ERR_FAILED, OpenEntry(key, &entry)); |
DisableIntegrityCheck(); |
@@ -3688,7 +3687,7 @@ TEST_F(DiskCacheEntryTest, SimpleCacheStream1SizeChanges) { |
SetSimpleCacheMode(); |
InitCache(); |
disk_cache::Entry* entry = NULL; |
- const char key[] = "the key"; |
+ const std::string key("the key"); |
const int kSize = 100; |
scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kSize)); |
scoped_refptr<net::IOBuffer> buffer_read(new net::IOBuffer(kSize)); |
@@ -3726,7 +3725,7 @@ TEST_F(DiskCacheEntryTest, SimpleCacheStream1SizeChanges) { |
int sparse_data_size = 0; |
disk_cache::SimpleEntryStat entry_stat( |
base::Time::Now(), base::Time::Now(), data_size, sparse_data_size); |
- int eof_offset = entry_stat.GetEOFOffsetInFile(key, 0); |
+ int eof_offset = entry_stat.GetEOFOffsetInFile(key.size(), 0); |
disk_cache::SimpleFileEOF eof_record; |
ASSERT_EQ(static_cast<int>(sizeof(eof_record)), |
entry_file0.Read(eof_offset, reinterpret_cast<char*>(&eof_record), |