Revert 52334 - Http Cache: chain GetLoadState from transactions waiting for

access to an entry to the transaction that has exclusive
access to that entry.

This means that requests that are blocked on the single writer
lock of the http cache will report the load state of the
request that has the lock, and WAITING_FOR_CACHE is reserved
for requests that are actually waiting for the entry to be
created by the cache.

BUG=43582
TEST=net_unittests


Review URL: http://codereview.chromium.org/2976004

TBR=rvargas@google.com
Review URL: http://codereview.chromium.org/2921010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52405 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 16 deletions

diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
index f524c60..96a3622 100644
--- a/net/http/http_cache_transaction.cc
+++ b/net/http/http_cache_transaction.cc
@@ -314,14 +314,11 @@ const HttpResponseInfo* HttpCache::Transaction::GetResponseInfo() const {
 }
 
 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 @@ bool HttpCache::Transaction::AddTruncatedFlag() {
   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) {