| Index: webkit/appcache/appcache_url_request_job_unittest.cc
|
| diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc
|
| index 5001ceac72c6de869fbf82f6ae571adfed084281..52fe7ee10c19b89de124ebe9f95bf42a38c963a9 100644
|
| --- a/webkit/appcache/appcache_url_request_job_unittest.cc
|
| +++ b/webkit/appcache/appcache_url_request_job_unittest.cc
|
| @@ -380,7 +380,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
| // Create an instance and see that it looks as expected.
|
|
|
| job = new AppCacheURLRequestJob(
|
| - &request, empty_context_.network_delegate(), storage);
|
| + &request, NULL, storage);
|
| EXPECT_TRUE(job->is_waiting());
|
| EXPECT_FALSE(job->is_delivering_appcache_response());
|
| EXPECT_FALSE(job->is_delivering_network_response());
|
| @@ -403,20 +403,17 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
| // Create an instance, give it a delivery order and see that
|
| // it looks as expected.
|
|
|
| - job = new AppCacheURLRequestJob(
|
| - &request, empty_context_.network_delegate(), storage);
|
| + job = new AppCacheURLRequestJob(&request, NULL, storage);
|
| job->DeliverErrorResponse();
|
| EXPECT_TRUE(job->is_delivering_error_response());
|
| EXPECT_FALSE(job->has_been_started());
|
|
|
| - job = new AppCacheURLRequestJob(
|
| - &request, empty_context_.network_delegate(), storage);
|
| + job = new AppCacheURLRequestJob(&request, NULL, storage);
|
| job->DeliverNetworkResponse();
|
| EXPECT_TRUE(job->is_delivering_network_response());
|
| EXPECT_FALSE(job->has_been_started());
|
|
|
| - job = new AppCacheURLRequestJob(
|
| - &request, empty_context_.network_delegate(), storage);
|
| + job = new AppCacheURLRequestJob(&request, NULL, storage);
|
| const GURL kManifestUrl("http://blah/");
|
| const int64 kCacheId(1);
|
| const int64 kGroupId(1);
|
| @@ -450,7 +447,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
| // Setup to create an AppCacheURLRequestJob with orders to deliver
|
| // a network response.
|
| mock_factory_job_ = new AppCacheURLRequestJob(
|
| - request_.get(), empty_context_.network_delegate(), storage);
|
| + request_.get(), NULL, storage);
|
| mock_factory_job_->DeliverNetworkResponse();
|
| EXPECT_TRUE(mock_factory_job_->is_delivering_network_response());
|
| EXPECT_FALSE(mock_factory_job_->has_been_started());
|
| @@ -484,7 +481,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
| // Setup to create an AppCacheURLRequestJob with orders to deliver
|
| // a network response.
|
| mock_factory_job_ = new AppCacheURLRequestJob(
|
| - request_.get(), empty_context_.network_delegate(), storage);
|
| + request_.get(), NULL, storage);
|
| mock_factory_job_->DeliverErrorResponse();
|
| EXPECT_TRUE(mock_factory_job_->is_delivering_error_response());
|
| EXPECT_FALSE(mock_factory_job_->has_been_started());
|
| @@ -533,7 +530,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
| // Setup to create an AppCacheURLRequestJob with orders to deliver
|
| // a network response.
|
| scoped_refptr<AppCacheURLRequestJob> job(new AppCacheURLRequestJob(
|
| - request_.get(), empty_context_.network_delegate(), storage));
|
| + request_.get(), NULL, storage));
|
|
|
| if (start_after_delivery_orders) {
|
| job->DeliverAppCachedResponse(
|
| @@ -649,7 +646,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
|
|
| // Create job with orders to deliver an appcached entry.
|
| scoped_refptr<AppCacheURLRequestJob> job(new AppCacheURLRequestJob(
|
| - request_.get(), empty_context_.network_delegate(), storage));
|
| + request_.get(), NULL, storage));
|
| job->DeliverAppCachedResponse(
|
| GURL(), 0, 111,
|
| AppCacheEntry(AppCacheEntry::EXPLICIT, written_response_id_),
|
|
|