diff options
author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 21:29:32 +0000 |
---|---|---|
committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 21:29:32 +0000 |
commit | 78e813bc5d8f1aab6752f6b104b2287e19113f1e (patch) | |
tree | 6c1f424a06e5d401c006a0b9be701c98a097b6e4 /net/http/http_cache_unittest.cc | |
parent | 74d1ee5ad4d9cf4208ee26ad21176f121010f075 (diff) | |
download | chromium_src-78e813bc5d8f1aab6752f6b104b2287e19113f1e.zip chromium_src-78e813bc5d8f1aab6752f6b104b2287e19113f1e.tar.gz chromium_src-78e813bc5d8f1aab6752f6b104b2287e19113f1e.tar.bz2 |
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
Diffstat (limited to 'net/http/http_cache_unittest.cc')
-rw-r--r-- | net/http/http_cache_unittest.cc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc index e341674..dc114da 100644 --- a/net/http/http_cache_unittest.cc +++ b/net/http/http_cache_unittest.cc @@ -1401,17 +1401,10 @@ TEST(HttpCache, SimpleGET_ManyReaders) { c->result = cache.http_cache()->CreateTransaction(&c->trans); EXPECT_EQ(net::OK, c->result); - EXPECT_EQ(net::LOAD_STATE_IDLE, c->trans->GetLoadState()); c->result = c->trans->Start(&request, &c->callback, net::BoundNetLog()); } - // All requests are waiting for the active entry. - for (int i = 0; i < kNumTransactions; ++i) { - Context* c = context_list[i]; - EXPECT_EQ(net::LOAD_STATE_WAITING_FOR_CACHE, c->trans->GetLoadState()); - } - // Allow all requests to move from the Create queue to the active entry. MessageLoop::current()->RunAllPending(); @@ -1422,13 +1415,6 @@ TEST(HttpCache, SimpleGET_ManyReaders) { EXPECT_EQ(0, cache.disk_cache()->open_count()); EXPECT_EQ(1, cache.disk_cache()->create_count()); - // All requests depend on the writer, and the writer is between Start and - // Read, i.e. idle. - for (int i = 0; i < kNumTransactions; ++i) { - Context* c = context_list[i]; - EXPECT_EQ(net::LOAD_STATE_IDLE, c->trans->GetLoadState()); - } - for (int i = 0; i < kNumTransactions; ++i) { Context* c = context_list[i]; if (c->result == net::ERR_IO_PENDING) |