| Index: net/http/http_cache_unittest.cc
|
| ===================================================================
|
| --- net/http/http_cache_unittest.cc (revision 23124)
|
| +++ net/http/http_cache_unittest.cc (working copy)
|
| @@ -394,7 +394,7 @@
|
| scoped_ptr<net::HttpTransaction> trans(cache->CreateTransaction());
|
| ASSERT_TRUE(trans.get());
|
|
|
| - int rv = trans->Start(&request, &callback);
|
| + int rv = trans->Start(NULL, &request, &callback);
|
| if (rv == net::ERR_IO_PENDING)
|
| rv = callback.WaitForResult();
|
| ASSERT_EQ(net::OK, rv);
|
| @@ -680,7 +680,7 @@
|
| cache.http_cache()->CreateTransaction());
|
| ASSERT_TRUE(trans.get());
|
|
|
| - int rv = trans->Start(&request, &callback);
|
| + int rv = trans->Start(NULL, &request, &callback);
|
| if (rv == net::ERR_IO_PENDING)
|
| rv = callback.WaitForResult();
|
| ASSERT_EQ(net::ERR_CACHE_MISS, rv);
|
| @@ -837,7 +837,7 @@
|
| new Context(cache.http_cache()->CreateTransaction()));
|
|
|
| Context* c = context_list[i];
|
| - int rv = c->trans->Start(&request, &c->callback);
|
| + int rv = c->trans->Start(NULL, &request, &c->callback);
|
| if (rv != net::ERR_IO_PENDING)
|
| c->result = rv;
|
| }
|
| @@ -891,7 +891,7 @@
|
| if (i == 1 || i == 2)
|
| this_request = &reader_request;
|
|
|
| - int rv = c->trans->Start(this_request, &c->callback);
|
| + int rv = c->trans->Start(NULL, this_request, &c->callback);
|
| if (rv != net::ERR_IO_PENDING)
|
| c->result = rv;
|
| }
|
| @@ -963,7 +963,7 @@
|
| new Context(cache.http_cache()->CreateTransaction()));
|
|
|
| Context* c = context_list[i];
|
| - int rv = c->trans->Start(&request, &c->callback);
|
| + int rv = c->trans->Start(NULL, &request, &c->callback);
|
| if (rv != net::ERR_IO_PENDING)
|
| c->result = rv;
|
| }
|
| @@ -1006,7 +1006,7 @@
|
| new Context(cache.http_cache()->CreateTransaction()));
|
|
|
| Context* c = context_list[i];
|
| - int rv = c->trans->Start(&request, &c->callback);
|
| + int rv = c->trans->Start(NULL, &request, &c->callback);
|
| if (rv != net::ERR_IO_PENDING)
|
| c->result = rv;
|
| }
|
| @@ -1058,7 +1058,7 @@
|
|
|
| scoped_ptr<net::HttpTransaction> trans(
|
| cache.http_cache()->CreateTransaction());
|
| - int rv = trans->Start(&request, &callback);
|
| + int rv = trans->Start(NULL, &request, &callback);
|
| if (rv == net::ERR_IO_PENDING)
|
| rv = callback.WaitForResult();
|
| ASSERT_EQ(net::OK, rv);
|
| @@ -1573,7 +1573,7 @@
|
| cache.http_cache()->CreateTransaction());
|
| ASSERT_TRUE(trans.get());
|
|
|
| - int rv = trans->Start(&request, &callback);
|
| + int rv = trans->Start(NULL, &request, &callback);
|
| if (rv == net::ERR_IO_PENDING)
|
| rv = callback.WaitForResult();
|
| ASSERT_EQ(net::ERR_CACHE_MISS, rv);
|
| @@ -1977,13 +1977,13 @@
|
| c2(cache.http_cache()),
|
| c3(cache.http_cache());
|
|
|
| - c1.Start(&r1);
|
| + c1.Start(NULL, &r1);
|
|
|
| r2.load_flags |= net::LOAD_ONLY_FROM_CACHE;
|
| - c2.Start(&r2);
|
| + c2.Start(NULL, &r2);
|
|
|
| r3.load_flags |= net::LOAD_ONLY_FROM_CACHE;
|
| - c3.Start(&r3);
|
| + c3.Start(NULL, &r3);
|
|
|
| MessageLoop::current()->Run();
|
|
|
| @@ -2030,7 +2030,7 @@
|
| cache.http_cache()->CreateTransaction());
|
| ASSERT_TRUE(trans.get());
|
|
|
| - int rv = trans->Start(&request, &callback);
|
| + int rv = trans->Start(NULL, &request, &callback);
|
| if (rv == net::ERR_IO_PENDING)
|
| rv = callback.WaitForResult();
|
| ASSERT_EQ(net::OK, rv);
|
| @@ -2057,7 +2057,7 @@
|
| cache.http_cache()->CreateTransaction());
|
| ASSERT_TRUE(trans.get());
|
|
|
| - int rv = trans->Start(&request, &callback);
|
| + int rv = trans->Start(NULL, &request, &callback);
|
| if (rv == net::ERR_IO_PENDING)
|
| rv = callback.WaitForResult();
|
| ASSERT_EQ(net::OK, rv);
|
| @@ -2184,7 +2184,7 @@
|
| cache.http_cache()->CreateTransaction());
|
| ASSERT_TRUE(trans.get());
|
|
|
| - int rv = trans->Start(&request, &callback);
|
| + int rv = trans->Start(NULL, &request, &callback);
|
| if (rv == net::ERR_IO_PENDING)
|
| rv = callback.WaitForResult();
|
| ASSERT_EQ(net::ERR_CACHE_MISS, rv);
|
|
|