| Index: content/browser/appcache/appcache_request_handler_unittest.cc
|
| diff --git a/content/browser/appcache/appcache_request_handler_unittest.cc b/content/browser/appcache/appcache_request_handler_unittest.cc
|
| index ef02bcd2120834cfa4c4ff0025ba323fdd04d0a7..f05fed295449569d811ed8024927bb4f3ab01ed9 100644
|
| --- a/content/browser/appcache/appcache_request_handler_unittest.cc
|
| +++ b/content/browser/appcache/appcache_request_handler_unittest.cc
|
| @@ -254,7 +254,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
| base::Unretained(this)));
|
|
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_MAIN_FRAME,
|
| false));
|
| @@ -303,7 +303,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
| base::Unretained(this)));
|
|
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_MAIN_FRAME,
|
| false));
|
| @@ -353,7 +353,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
| base::Unretained(this)));
|
|
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_MAIN_FRAME,
|
| false));
|
| @@ -436,7 +436,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
|
|
| request_ = empty_context_.CreateRequest(
|
| GURL("http://blah/fallback-override"), net::DEFAULT_PRIORITY,
|
| - &delegate_, NULL);
|
| + &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_MAIN_FRAME,
|
| false));
|
| @@ -490,7 +490,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
|
|
| void SubResource_Miss_WithNoCacheSelected() {
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_SUB_RESOURCE,
|
| false));
|
| @@ -510,7 +510,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
| host_->AssociateCompleteCache(MakeNewCache());
|
|
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_SUB_RESOURCE,
|
| false));
|
| @@ -543,7 +543,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
| host_->set_preferred_manifest_url(cache->owning_group()->manifest_url());
|
|
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_SUB_RESOURCE,
|
| false));
|
| @@ -579,7 +579,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
| AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false);
|
|
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_SUB_RESOURCE,
|
| false));
|
| @@ -613,7 +613,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
| AppCacheEntry(), AppCacheEntry(AppCacheEntry::EXPLICIT, 1), false);
|
|
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_SUB_RESOURCE,
|
| false));
|
| @@ -648,7 +648,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
| AppCacheEntry(), AppCacheEntry(AppCacheEntry::EXPLICIT, 1), false);
|
|
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_SUB_RESOURCE,
|
| false));
|
| @@ -684,7 +684,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
| AppCacheEntry(), AppCacheEntry(), true);
|
|
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_SUB_RESOURCE,
|
| false));
|
| @@ -715,7 +715,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
| AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false);
|
|
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_SUB_RESOURCE,
|
| false));
|
| @@ -743,7 +743,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
| host_->pending_selected_cache_id_ = 1;
|
|
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_SUB_RESOURCE,
|
| false));
|
| @@ -777,7 +777,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
| host_->pending_selected_cache_id_ = 1;
|
|
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("ftp://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("ftp://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_SUB_RESOURCE,
|
| false));
|
| @@ -799,7 +799,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
|
|
| void CanceledRequest() {
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_MAIN_FRAME,
|
| false));
|
| @@ -837,7 +837,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
| RESOURCE_TYPE_WORKER));
|
|
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
|
|
| const int kParentHostId = host_->host_id();
|
| const int kWorkerHostId = 2;
|
| @@ -875,7 +875,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
|
| base::Unretained(this)));
|
|
|
| request_ = empty_context_.CreateRequest(
|
| - GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL);
|
| + GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
|
| handler_.reset(host_->CreateRequestHandler(request_.get(),
|
| RESOURCE_TYPE_MAIN_FRAME,
|
| false));
|
|
|