| 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 43ae76bb4eb53044b81d9b5b35a96a96e688f089..1c2d1f1d1da03ec791dd6d747f0ae530692223f9 100644
|
| --- a/webkit/appcache/appcache_url_request_job_unittest.cc
|
| +++ b/webkit/appcache/appcache_url_request_job_unittest.cc
|
| @@ -16,6 +16,7 @@
|
| #include "net/base/net_errors.h"
|
| #include "net/http/http_response_headers.h"
|
| #include "net/url_request/url_request.h"
|
| +#include "net/url_request/url_request_context.h"
|
| #include "net/url_request/url_request_error_job.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "webkit/appcache/appcache_response.h"
|
| @@ -369,7 +370,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
| // Basic -------------------------------------------------------------------
|
| void Basic() {
|
| AppCacheStorage* storage = service_->storage();
|
| - net::URLRequest request(GURL("http://blah/"), NULL);
|
| + net::URLRequest request(GURL("http://blah/"), NULL, &empty_context_);
|
| scoped_refptr<AppCacheURLRequestJob> job;
|
|
|
| // Create an instance and see that it looks as expected.
|
| @@ -391,7 +392,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
| // DeliveryOrders -----------------------------------------------------
|
| void DeliveryOrders() {
|
| AppCacheStorage* storage = service_->storage();
|
| - net::URLRequest request(GURL("http://blah/"), NULL);
|
| + net::URLRequest request(GURL("http://blah/"), NULL, &empty_context_);
|
| scoped_refptr<AppCacheURLRequestJob> job;
|
|
|
| // Create an instance, give it a delivery order and see that
|
| @@ -436,7 +437,9 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
|
|
| AppCacheStorage* storage = service_->storage();
|
| request_.reset(
|
| - new net::URLRequest(GURL("http://blah/"), url_request_delegate_.get()));
|
| + new net::URLRequest(GURL("http://blah/"),
|
| + url_request_delegate_.get(),
|
| + &empty_context_));
|
|
|
| // Setup to create an AppCacheURLRequestJob with orders to deliver
|
| // a network response.
|
| @@ -469,7 +472,9 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
|
|
| AppCacheStorage* storage = service_->storage();
|
| request_.reset(
|
| - new net::URLRequest(GURL("http://blah/"), url_request_delegate_.get()));
|
| + new net::URLRequest(GURL("http://blah/"),
|
| + url_request_delegate_.get(),
|
| + &empty_context_));
|
|
|
| // Setup to create an AppCacheURLRequestJob with orders to deliver
|
| // a network response.
|
| @@ -517,7 +522,9 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
| void RequestAppCachedResource(bool start_after_delivery_orders) {
|
| AppCacheStorage* storage = service_->storage();
|
| request_.reset(
|
| - new net::URLRequest(GURL("http://blah/"), url_request_delegate_.get()));
|
| + new net::URLRequest(GURL("http://blah/"),
|
| + url_request_delegate_.get(),
|
| + &empty_context_));
|
|
|
| // Setup to create an AppCacheURLRequestJob with orders to deliver
|
| // a network response.
|
| @@ -629,7 +636,9 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
| void MakeRangeRequest() {
|
| AppCacheStorage* storage = service_->storage();
|
| request_.reset(
|
| - new net::URLRequest(GURL("http://blah/"), url_request_delegate_.get()));
|
| + new net::URLRequest(GURL("http://blah/"),
|
| + url_request_delegate_.get(),
|
| + &empty_context_));
|
|
|
| // Request a range, the 3 middle chars out of 'Hello'
|
| net::HttpRequestHeaders extra_headers;
|
| @@ -747,6 +756,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
| int writer_deletion_count_down_;
|
|
|
| net::URLRequest::ProtocolFactory* orig_http_factory_;
|
| + net::URLRequestContext empty_context_;
|
| scoped_ptr<net::URLRequest> request_;
|
| scoped_ptr<MockURLRequestDelegate> url_request_delegate_;
|
|
|
|
|