| Index: net/http/http_cache_transaction.cc
|
| ===================================================================
|
| --- net/http/http_cache_transaction.cc (revision 52403)
|
| +++ net/http/http_cache_transaction.cc (working copy)
|
| @@ -314,14 +314,11 @@
|
| }
|
|
|
| LoadState HttpCache::Transaction::GetLoadState() const {
|
| - LoadState state = GetWriterLoadState();
|
| - if (state != LOAD_STATE_WAITING_FOR_CACHE)
|
| - return state;
|
| -
|
| - if (cache_)
|
| - return cache_->GetLoadStateForPendingTransaction(this);
|
| -
|
| - return LOAD_STATE_IDLE;
|
| + if (network_trans_.get())
|
| + return network_trans_->GetLoadState();
|
| + if (entry_ || !request_)
|
| + return LOAD_STATE_IDLE;
|
| + return LOAD_STATE_WAITING_FOR_CACHE;
|
| }
|
|
|
| uint64 HttpCache::Transaction::GetUploadProgress() const {
|
| @@ -369,14 +366,6 @@
|
| return true;
|
| }
|
|
|
| -LoadState HttpCache::Transaction::GetWriterLoadState() const {
|
| - if (network_trans_.get())
|
| - return network_trans_->GetLoadState();
|
| - if (entry_ || !request_)
|
| - return LOAD_STATE_IDLE;
|
| - return LOAD_STATE_WAITING_FOR_CACHE;
|
| -}
|
| -
|
| //-----------------------------------------------------------------------------
|
|
|
| void HttpCache::Transaction::DoCallback(int rv) {
|
|
|