| Index: net/http/mock_http_cache.h
|
| diff --git a/net/http/mock_http_cache.h b/net/http/mock_http_cache.h
|
| index b834d3fdd39ea5f440dc8d77802dbc141c6ababc..35e22039121a456e721c05b3770a00933e60363e 100644
|
| --- a/net/http/mock_http_cache.h
|
| +++ b/net/http/mock_http_cache.h
|
| @@ -31,18 +31,29 @@ class MockDiskEntry : public disk_cache::Entry,
|
| virtual base::Time GetLastUsed() const OVERRIDE;
|
| virtual base::Time GetLastModified() const OVERRIDE;
|
| virtual int32 GetDataSize(int index) const OVERRIDE;
|
| - virtual int ReadData(int index, int offset, net::IOBuffer* buf, int buf_len,
|
| + virtual int ReadData(int index,
|
| + int offset,
|
| + net::IOBuffer* buf,
|
| + int buf_len,
|
| const net::CompletionCallback& callback) OVERRIDE;
|
| - virtual int WriteData(int index, int offset, net::IOBuffer* buf, int buf_len,
|
| + virtual int WriteData(int index,
|
| + int offset,
|
| + net::IOBuffer* buf,
|
| + int buf_len,
|
| const net::CompletionCallback& callback,
|
| bool truncate) OVERRIDE;
|
| - virtual int ReadSparseData(int64 offset, net::IOBuffer* buf, int buf_len,
|
| + virtual int ReadSparseData(int64 offset,
|
| + net::IOBuffer* buf,
|
| + int buf_len,
|
| const net::CompletionCallback& callback) OVERRIDE;
|
| - virtual int WriteSparseData(
|
| - int64 offset, net::IOBuffer* buf, int buf_len,
|
| - const net::CompletionCallback& callback) OVERRIDE;
|
| + virtual int WriteSparseData(int64 offset,
|
| + net::IOBuffer* buf,
|
| + int buf_len,
|
| + const net::CompletionCallback& callback) OVERRIDE;
|
| virtual int GetAvailableRange(
|
| - int64 offset, int len, int64* start,
|
| + int64 offset,
|
| + int len,
|
| + int64* start,
|
| const net::CompletionCallback& callback) OVERRIDE;
|
| virtual bool CouldBeSparse() const OVERRIDE;
|
| virtual void CancelSparseIO() OVERRIDE;
|
| @@ -74,7 +85,8 @@ class MockDiskEntry : public disk_cache::Entry,
|
|
|
| // When |store| is true, stores the callback to be delivered later; otherwise
|
| // delivers any callback previously stored.
|
| - static void StoreAndDeliverCallbacks(bool store, MockDiskEntry* entry,
|
| + static void StoreAndDeliverCallbacks(bool store,
|
| + MockDiskEntry* entry,
|
| const net::CompletionCallback& callback,
|
| int result);
|
|
|
| @@ -100,9 +112,11 @@ class MockDiskCache : public disk_cache::Backend {
|
|
|
| virtual net::CacheType GetCacheType() const OVERRIDE;
|
| virtual int32 GetEntryCount() const OVERRIDE;
|
| - virtual int OpenEntry(const std::string& key, disk_cache::Entry** entry,
|
| + virtual int OpenEntry(const std::string& key,
|
| + disk_cache::Entry** entry,
|
| const net::CompletionCallback& callback) OVERRIDE;
|
| - virtual int CreateEntry(const std::string& key, disk_cache::Entry** entry,
|
| + virtual int CreateEntry(const std::string& key,
|
| + disk_cache::Entry** entry,
|
| const net::CompletionCallback& callback) OVERRIDE;
|
| virtual int DoomEntry(const std::string& key,
|
| const net::CompletionCallback& callback) OVERRIDE;
|
| @@ -114,7 +128,8 @@ class MockDiskCache : public disk_cache::Backend {
|
| virtual int DoomEntriesSince(
|
| base::Time initial_time,
|
| const net::CompletionCallback& callback) OVERRIDE;
|
| - virtual int OpenNextEntry(void** iter, disk_cache::Entry** next_entry,
|
| + virtual int OpenNextEntry(void** iter,
|
| + disk_cache::Entry** next_entry,
|
| const net::CompletionCallback& callback) OVERRIDE;
|
| virtual void EndEnumeration(void** iter) OVERRIDE;
|
| virtual void GetStats(
|
| @@ -192,7 +207,8 @@ class MockHttpCache {
|
| bool OpenBackendEntry(const std::string& key, disk_cache::Entry** entry);
|
|
|
| // Helper function to synchronously create a backend entry.
|
| - bool CreateBackendEntry(const std::string& key, disk_cache::Entry** entry,
|
| + bool CreateBackendEntry(const std::string& key,
|
| + disk_cache::Entry** entry,
|
| net::NetLog* net_log);
|
|
|
| // Returns the test mode after considering the global override.
|
| @@ -208,7 +224,8 @@ class MockHttpCache {
|
|
|
| // This version of the disk cache doesn't invoke CreateEntry callbacks.
|
| class MockDiskCacheNoCB : public MockDiskCache {
|
| - virtual int CreateEntry(const std::string& key, disk_cache::Entry** entry,
|
| + virtual int CreateEntry(const std::string& key,
|
| + disk_cache::Entry** entry,
|
| const net::CompletionCallback& callback) OVERRIDE;
|
| };
|
|
|
|
|