| Index: net/disk_cache/simple/simple_backend_impl.h
|
| diff --git a/net/disk_cache/simple/simple_backend_impl.h b/net/disk_cache/simple/simple_backend_impl.h
|
| index 2bd00818b9cfb1f550f432f9f53521b41b66f049..9de729420698cc72db6cc110a97fadb26eac6263 100644
|
| --- a/net/disk_cache/simple/simple_backend_impl.h
|
| +++ b/net/disk_cache/simple/simple_backend_impl.h
|
| @@ -97,9 +97,8 @@ class NET_EXPORT_PRIVATE SimpleBackendImpl : public Backend,
|
| const CompletionCallback& callback) OVERRIDE;
|
| virtual int DoomEntriesSince(base::Time initial_time,
|
| const CompletionCallback& callback) OVERRIDE;
|
| - virtual int OpenNextEntry(void** iter, Entry** next_entry,
|
| + virtual int OpenNextEntry(Iterator* iter, Entry** next_entry,
|
| const CompletionCallback& callback) OVERRIDE;
|
| - virtual void EndEnumeration(void** iter) OVERRIDE;
|
| virtual void GetStats(
|
| std::vector<std::pair<std::string, std::string> >* stats) OVERRIDE;
|
| virtual void OnExternalCacheHit(const std::string& key) OVERRIDE;
|
| @@ -158,10 +157,10 @@ class NET_EXPORT_PRIVATE SimpleBackendImpl : public Backend,
|
| // Called when the index is initilized to find the next entry in the iterator
|
| // |iter|. If there are no more hashes in the iterator list, net::ERR_FAILED
|
| // is returned. Otherwise, calls OpenEntryFromHash.
|
| - void GetNextEntryInIterator(void** iter,
|
| - Entry** next_entry,
|
| - const CompletionCallback& callback,
|
| - int error_code);
|
| + void OpenNextEntryImpl(Iterator* iter,
|
| + Entry** next_entry,
|
| + const CompletionCallback& callback,
|
| + int index_initialization_error_code);
|
|
|
| // Called when we tried to open an entry with hash alone. When a blank entry
|
| // has been created and filled in with information from the disk - based on a
|
| @@ -184,7 +183,7 @@ class NET_EXPORT_PRIVATE SimpleBackendImpl : public Backend,
|
| // Called at the end of the asynchronous operation triggered by
|
| // OpenEntryFromHash. Makes sure to continue iterating if the open entry was
|
| // not a success.
|
| - void CheckIterationReturnValue(void** iter,
|
| + void CheckIterationReturnValue(Iterator* iter,
|
| Entry** entry,
|
| const CompletionCallback& callback,
|
| int error_code);
|
|
|