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 1c2d1f1d1da03ec791dd6d747f0ae530692223f9..9fa8ded9e55ab593ce8b050209d52201d283d9f5 100644 |
--- a/webkit/appcache/appcache_url_request_job_unittest.cc |
+++ b/webkit/appcache/appcache_url_request_job_unittest.cc |
@@ -127,14 +127,17 @@ class AppCacheURLRequestJobTest : public testing::Test { |
bool kill_with_io_pending_; |
}; |
- static net::URLRequestJob* MockHttpJobFactory(net::URLRequest* request, |
- const std::string& scheme) { |
+ static net::URLRequestJob* MockHttpJobFactory( |
+ net::URLRequest* request, |
+ net::NetworkDelegate* network_delegate, |
+ const std::string& scheme) { |
if (mock_factory_job_) { |
net::URLRequestJob* temp = mock_factory_job_; |
mock_factory_job_ = NULL; |
return temp; |
} else { |
return new net::URLRequestErrorJob(request, |
+ network_delegate, |
net::ERR_INTERNET_DISCONNECTED); |
} |
} |
@@ -375,7 +378,8 @@ class AppCacheURLRequestJobTest : public testing::Test { |
// Create an instance and see that it looks as expected. |
- job = new AppCacheURLRequestJob(&request, storage); |
+ job = new AppCacheURLRequestJob( |
+ &request, empty_context_.network_delegate(), storage); |
EXPECT_TRUE(job->is_waiting()); |
EXPECT_FALSE(job->is_delivering_appcache_response()); |
EXPECT_FALSE(job->is_delivering_network_response()); |
@@ -398,17 +402,20 @@ class AppCacheURLRequestJobTest : public testing::Test { |
// Create an instance, give it a delivery order and see that |
// it looks as expected. |
- job = new AppCacheURLRequestJob(&request, storage); |
+ job = new AppCacheURLRequestJob( |
+ &request, empty_context_.network_delegate(), storage); |
job->DeliverErrorResponse(); |
EXPECT_TRUE(job->is_delivering_error_response()); |
EXPECT_FALSE(job->has_been_started()); |
- job = new AppCacheURLRequestJob(&request, storage); |
+ job = new AppCacheURLRequestJob( |
+ &request, empty_context_.network_delegate(), storage); |
job->DeliverNetworkResponse(); |
EXPECT_TRUE(job->is_delivering_network_response()); |
EXPECT_FALSE(job->has_been_started()); |
- job = new AppCacheURLRequestJob(&request, storage); |
+ job = new AppCacheURLRequestJob( |
+ &request, empty_context_.network_delegate(), storage); |
const GURL kManifestUrl("http://blah/"); |
const int64 kCacheId(1); |
const int64 kGroupId(1); |
@@ -443,7 +450,8 @@ class AppCacheURLRequestJobTest : public testing::Test { |
// Setup to create an AppCacheURLRequestJob with orders to deliver |
// a network response. |
- mock_factory_job_ = new AppCacheURLRequestJob(request_.get(), storage); |
+ mock_factory_job_ = new AppCacheURLRequestJob( |
+ request_.get(), empty_context_.network_delegate(), storage); |
mock_factory_job_->DeliverNetworkResponse(); |
EXPECT_TRUE(mock_factory_job_->is_delivering_network_response()); |
EXPECT_FALSE(mock_factory_job_->has_been_started()); |
@@ -478,7 +486,8 @@ class AppCacheURLRequestJobTest : public testing::Test { |
// Setup to create an AppCacheURLRequestJob with orders to deliver |
// a network response. |
- mock_factory_job_ = new AppCacheURLRequestJob(request_.get(), storage); |
+ mock_factory_job_ = new AppCacheURLRequestJob( |
+ request_.get(), empty_context_.network_delegate(), storage); |
mock_factory_job_->DeliverErrorResponse(); |
EXPECT_TRUE(mock_factory_job_->is_delivering_error_response()); |
EXPECT_FALSE(mock_factory_job_->has_been_started()); |
@@ -528,8 +537,8 @@ 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(), storage)); |
+ scoped_refptr<AppCacheURLRequestJob> job(new AppCacheURLRequestJob( |
+ request_.get(), empty_context_.network_delegate(), storage)); |
if (start_after_delivery_orders) { |
job->DeliverAppCachedResponse( |
@@ -646,8 +655,8 @@ class AppCacheURLRequestJobTest : public testing::Test { |
request_->SetExtraRequestHeaders(extra_headers); |
// Create job with orders to deliver an appcached entry. |
- scoped_refptr<AppCacheURLRequestJob> job( |
- new AppCacheURLRequestJob(request_.get(), storage)); |
+ scoped_refptr<AppCacheURLRequestJob> job(new AppCacheURLRequestJob( |
+ request_.get(), empty_context_.network_delegate(), storage)); |
job->DeliverAppCachedResponse( |
GURL(), 0, 111, |
AppCacheEntry(AppCacheEntry::EXPLICIT, written_response_id_), |