| Index: net/http/http_cache_unittest.cc
|
| ===================================================================
|
| --- net/http/http_cache_unittest.cc (revision 52403)
|
| +++ net/http/http_cache_unittest.cc (working copy)
|
| @@ -1401,17 +1401,10 @@
|
|
|
| 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,15 +1415,8 @@
|
| 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)
|
| c->result = c->callback.WaitForResult();
|
| ReadAndVerifyTransaction(c->trans.get(), kSimpleGET_Transaction);
|
|
|