Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/appcache/appcache_request_handler_unittest.cc

Issue 12321106: Update TestURLRequest constructor interface in unit tests. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Make use of NULL NetworkDelegate explicit in unit test. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/url_request/url_request.h ('K') | « net/url_request/url_request.h ('k') | webkit/appcache/appcache_url_request_job_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/appcache/appcache_request_handler_unittest.cc
diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/appcache/appcache_request_handler_unittest.cc
index 8d162d263fcf06905059ac99eb882ffee9e97570..2a9a21ad4fe6018158c0e0e2a351abbb6db2b636 100644
--- a/webkit/appcache/appcache_request_handler_unittest.cc
+++ b/webkit/appcache/appcache_request_handler_unittest.cc
@@ -117,13 +117,16 @@ class AppCacheRequestHandlerTest : public testing::Test {
class MockURLRequest : public net::URLRequest {
public:
- explicit MockURLRequest(const GURL& url, net::URLRequestContext* context) :
- net::URLRequest(url, NULL, context) {
+ explicit MockURLRequest(
+ const GURL& url,
+ net::URLRequestContext* context,
+ net::NetworkDelegate* network_delegate) :
+ net::URLRequest(url, NULL, context, network_delegate) {
}
void SimulateResponseCode(int http_response_code) {
mock_factory_job_ = new MockURLRequestJob(
- this, context()->network_delegate(), http_response_code);
+ this, network_delegate(), http_response_code);
Start();
DCHECK(!mock_factory_job_);
// All our simulation needs to satisfy are the following two DCHECKs
@@ -133,7 +136,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
void SimulateResponseInfo(const net::HttpResponseInfo& info) {
mock_factory_job_ = new MockURLRequestJob(
- this, context()->network_delegate(), info);
+ this, network_delegate(), info);
set_delegate(&delegate_); // needed to get the info back out
Start();
DCHECK(!mock_factory_job_);
@@ -172,7 +175,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
// Test harness --------------------------------------------------
AppCacheRequestHandlerTest()
- : host_(NULL), orig_http_factory_(NULL) {
+ : host_(NULL), empty_network_delegate_(NULL), orig_http_factory_(NULL) {
}
template <class Method>
@@ -200,6 +203,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
const int kHostId = 1;
backend_impl_->RegisterHost(kHostId);
host_ = backend_impl_->GetHost(kHostId);
+ empty_network_delegate_ = NULL;
}
void TearDownTest() {
@@ -216,6 +220,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_service_.reset();
mock_policy_.reset();
host_ = NULL;
+ empty_network_delegate_ = NULL;
}
void TestFinished() {
@@ -254,13 +259,13 @@ class AppCacheRequestHandlerTest : public testing::Test {
base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Miss,
base::Unretained(this)));
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::MAIN_FRAME));
EXPECT_TRUE(handler_.get());
- job_ = handler_->MaybeLoadResource(request_.get(),
- empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_TRUE(job_.get());
EXPECT_TRUE(job_->is_waiting());
@@ -282,11 +287,11 @@ class AppCacheRequestHandlerTest : public testing::Test {
AppCacheURLRequestJob* fallback_job;
fallback_job = handler_->MaybeLoadFallbackForRedirect(
request_.get(),
- request_->context()->network_delegate(),
+ empty_network_delegate_,
GURL("http://blah/redirect"));
EXPECT_FALSE(fallback_job);
fallback_job = handler_->MaybeLoadFallbackForResponse(
- request_.get(), request_->context()->network_delegate());
+ request_.get(), empty_network_delegate_);
EXPECT_FALSE(fallback_job);
EXPECT_TRUE(host_->preferred_manifest_url().is_empty());
@@ -301,7 +306,8 @@ class AppCacheRequestHandlerTest : public testing::Test {
base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Hit,
base::Unretained(this)));
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::MAIN_FRAME));
EXPECT_TRUE(handler_.get());
@@ -311,8 +317,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
GURL(), AppCacheEntry(),
1, 2, GURL("http://blah/manifest/"));
- job_ = handler_->MaybeLoadResource(request_.get(),
- empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_TRUE(job_.get());
EXPECT_TRUE(job_->is_waiting());
@@ -333,7 +338,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
AppCacheURLRequestJob* fallback_job;
fallback_job = handler_->MaybeLoadFallbackForResponse(
- request_.get(), request_->context()->network_delegate());
+ request_.get(), empty_network_delegate_);
EXPECT_FALSE(fallback_job);
EXPECT_EQ(GURL("http://blah/manifest/"),
@@ -349,7 +354,8 @@ class AppCacheRequestHandlerTest : public testing::Test {
base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Fallback,
base::Unretained(this)));
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::MAIN_FRAME));
EXPECT_TRUE(handler_.get());
@@ -360,8 +366,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
AppCacheEntry(AppCacheEntry::EXPLICIT, 1),
1, 2, GURL("http://blah/manifest/"));
- job_ = handler_->MaybeLoadResource(request_.get(),
- empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_TRUE(job_.get());
EXPECT_TRUE(job_->is_waiting());
@@ -376,15 +381,14 @@ class AppCacheRequestHandlerTest : public testing::Test {
// When the request is restarted, the existing job is dropped so a
// real network job gets created. We expect NULL here which will cause
// the net library to create a real job.
- job_ = handler_->MaybeLoadResource(request_.get(),
- empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_FALSE(job_);
// Simulate an http error of the real network job.
request_->SimulateResponseCode(500);
job_ = handler_->MaybeLoadFallbackForResponse(
- request_.get(), request_->context()->network_delegate());
+ request_.get(), empty_network_delegate_);
EXPECT_TRUE(job_);
EXPECT_TRUE(job_->is_delivering_appcache_response());
@@ -409,8 +413,9 @@ class AppCacheRequestHandlerTest : public testing::Test {
&AppCacheRequestHandlerTest::Verify_MainResource_FallbackOverride,
base::Unretained(this)));
- request_.reset(new MockURLRequest(GURL("http://blah/fallback-override"),
- &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/fallback-override"),
+ &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::MAIN_FRAME));
EXPECT_TRUE(handler_.get());
@@ -421,8 +426,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
AppCacheEntry(AppCacheEntry::EXPLICIT, 1),
1, 2, GURL("http://blah/manifest/"));
- job_ = handler_->MaybeLoadResource(request_.get(),
- empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_TRUE(job_.get());
EXPECT_TRUE(job_->is_waiting());
@@ -437,8 +441,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
// When the request is restarted, the existing job is dropped so a
// real network job gets created. We expect NULL here which will cause
// the net library to create a real job.
- job_ = handler_->MaybeLoadResource(request_.get(),
- empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_FALSE(job_);
// Simulate an http error of the real network job, but with custom
@@ -452,8 +455,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
std::string(kOverrideHeaders, arraysize(kOverrideHeaders)));
request_->SimulateResponseInfo(info);
- job_ = handler_->MaybeLoadFallbackForResponse(
- request_.get(), request_->context()->network_delegate());
+ job_ = handler_->MaybeLoadFallbackForResponse(request_.get(), NULL);
EXPECT_FALSE(job_);
TestFinished();
@@ -462,7 +464,8 @@ class AppCacheRequestHandlerTest : public testing::Test {
// SubResource_Miss_WithNoCacheSelected ----------------------------------
void SubResource_Miss_WithNoCacheSelected() {
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
@@ -480,24 +483,21 @@ class AppCacheRequestHandlerTest : public testing::Test {
// in a network or fallback namespace, should result in a failed request.
host_->AssociateCompleteCache(MakeNewCache());
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
- job_ = handler_->MaybeLoadResource(request_.get(),
- empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_TRUE(job_.get());
EXPECT_TRUE(job_->is_delivering_error_response());
AppCacheURLRequestJob* fallback_job;
fallback_job = handler_->MaybeLoadFallbackForRedirect(
- request_.get(),
- empty_context_.network_delegate(),
- GURL("http://blah/redirect"));
+ request_.get(), NULL, GURL("http://blah/redirect"));
EXPECT_FALSE(fallback_job);
- fallback_job = handler_->MaybeLoadFallbackForResponse(
- request_.get(), empty_context_.network_delegate());
+ fallback_job = handler_->MaybeLoadFallbackForResponse(request_.get(), NULL);
EXPECT_FALSE(fallback_job);
TestFinished();
@@ -511,12 +511,12 @@ class AppCacheRequestHandlerTest : public testing::Test {
host_->pending_selected_cache_id_ = cache->cache_id();
host_->set_preferred_manifest_url(cache->owning_group()->manifest_url());
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
- job_ = handler_->MaybeLoadResource(request_.get(),
- empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_TRUE(job_.get());
EXPECT_TRUE(job_->is_waiting());
@@ -526,12 +526,9 @@ class AppCacheRequestHandlerTest : public testing::Test {
AppCacheURLRequestJob* fallback_job;
fallback_job = handler_->MaybeLoadFallbackForRedirect(
- request_.get(),
- empty_context_.network_delegate(),
- GURL("http://blah/redirect"));
+ request_.get(), NULL, GURL("http://blah/redirect"));
EXPECT_FALSE(fallback_job);
- fallback_job = handler_->MaybeLoadFallbackForResponse(
- request_.get(), empty_context_.network_delegate());
+ fallback_job = handler_->MaybeLoadFallbackForResponse(request_.get(), NULL);
EXPECT_FALSE(fallback_job);
TestFinished();
@@ -545,23 +542,20 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false);
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
- job_ = handler_->MaybeLoadResource(request_.get(),
- empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_TRUE(job_.get());
EXPECT_TRUE(job_->is_delivering_appcache_response());
AppCacheURLRequestJob* fallback_job;
fallback_job = handler_->MaybeLoadFallbackForRedirect(
- request_.get(),
- empty_context_.network_delegate(),
- GURL("http://blah/redirect"));
+ request_.get(), NULL, GURL("http://blah/redirect"));
EXPECT_FALSE(fallback_job);
- fallback_job = handler_->MaybeLoadFallbackForResponse(
- request_.get(), empty_context_.network_delegate());
+ fallback_job = handler_->MaybeLoadFallbackForResponse(request_.get(), NULL);
EXPECT_FALSE(fallback_job);
TestFinished();
@@ -577,24 +571,21 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(), AppCacheEntry(AppCacheEntry::EXPLICIT, 1), false);
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
- job_ = handler_->MaybeLoadResource(request_.get(),
- empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_FALSE(job_.get());
job_ = handler_->MaybeLoadFallbackForRedirect(
- request_.get(),
- empty_context_.network_delegate(),
- GURL("http://not_blah/redirect"));
+ request_.get(), NULL, GURL("http://not_blah/redirect"));
EXPECT_TRUE(job_.get());
EXPECT_TRUE(job_->is_delivering_appcache_response());
AppCacheURLRequestJob* fallback_job;
- fallback_job = handler_->MaybeLoadFallbackForResponse(
- request_.get(), empty_context_.network_delegate());
+ fallback_job = handler_->MaybeLoadFallbackForResponse(request_.get(), NULL);
EXPECT_FALSE(fallback_job);
TestFinished();
@@ -610,24 +601,21 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(), AppCacheEntry(AppCacheEntry::EXPLICIT, 1), false);
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
- job_ = handler_->MaybeLoadResource(request_.get(),
- empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_FALSE(job_.get());
AppCacheURLRequestJob* fallback_job;
fallback_job = handler_->MaybeLoadFallbackForRedirect(
- request_.get(),
- empty_context_.network_delegate(),
- GURL("http://blah/redirect"));
+ request_.get(), NULL, GURL("http://blah/redirect"));
EXPECT_FALSE(fallback_job);
request_->SimulateResponseCode(200);
- fallback_job = handler_->MaybeLoadFallbackForResponse(
- request_.get(), empty_context_.network_delegate());
+ fallback_job = handler_->MaybeLoadFallbackForResponse(request_.get(), NULL);
EXPECT_FALSE(fallback_job);
TestFinished();
@@ -644,22 +632,19 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(), AppCacheEntry(), true);
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
- job_ = handler_->MaybeLoadResource(request_.get(),
- empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_FALSE(job_.get());
AppCacheURLRequestJob* fallback_job;
fallback_job = handler_->MaybeLoadFallbackForRedirect(
- request_.get(),
- empty_context_.network_delegate(),
- GURL("http://blah/redirect"));
+ request_.get(), NULL, GURL("http://blah/redirect"));
EXPECT_FALSE(fallback_job);
- fallback_job = handler_->MaybeLoadFallbackForResponse(
- request_.get(), empty_context_.network_delegate());
+ fallback_job = handler_->MaybeLoadFallbackForResponse(request_.get(), NULL);
EXPECT_FALSE(fallback_job);
TestFinished();
@@ -673,7 +658,8 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false);
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
@@ -681,14 +667,10 @@ class AppCacheRequestHandlerTest : public testing::Test {
backend_impl_->UnregisterHost(1);
host_ = NULL;
- EXPECT_FALSE(handler_->MaybeLoadResource(
- request_.get(), empty_context_.network_delegate()));
+ EXPECT_FALSE(handler_->MaybeLoadResource(request_.get(), NULL));
EXPECT_FALSE(handler_->MaybeLoadFallbackForRedirect(
- request_.get(),
- empty_context_.network_delegate(),
- GURL("http://blah/redirect")));
- EXPECT_FALSE(handler_->MaybeLoadFallbackForResponse(
- request_.get(), empty_context_.network_delegate()));
+ request_.get(), NULL, GURL("http://blah/redirect")));
+ EXPECT_FALSE(handler_->MaybeLoadFallbackForResponse(request_.get(), NULL));
TestFinished();
}
@@ -699,13 +681,13 @@ class AppCacheRequestHandlerTest : public testing::Test {
// Precondition, the host is waiting on cache selection.
host_->pending_selected_cache_id_ = 1;
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
- job_ = handler_->MaybeLoadResource(
- request_.get(), empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_TRUE(job_.get());
EXPECT_TRUE(job_->is_waiting());
@@ -713,14 +695,11 @@ class AppCacheRequestHandlerTest : public testing::Test {
host_ = NULL;
EXPECT_TRUE(job_->has_been_killed());
- EXPECT_FALSE(handler_->MaybeLoadResource(
- request_.get(), empty_context_.network_delegate()));
+ EXPECT_FALSE(handler_->MaybeLoadResource(request_.get(), NULL));
EXPECT_FALSE(handler_->MaybeLoadFallbackForRedirect(
- request_.get(),
- empty_context_.network_delegate(),
- GURL("http://blah/redirect")));
+ request_.get(), NULL, GURL("http://blah/redirect")));
EXPECT_FALSE(handler_->MaybeLoadFallbackForResponse(
- request_.get(), empty_context_.network_delegate()));
+ request_.get(), NULL));
TestFinished();
}
@@ -731,19 +710,18 @@ class AppCacheRequestHandlerTest : public testing::Test {
// Precondition, the host is waiting on cache selection.
host_->pending_selected_cache_id_ = 1;
- request_.reset(new MockURLRequest(GURL("ftp://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get()); // we could redirect to http (conceivably)
EXPECT_FALSE(handler_->MaybeLoadResource(
- request_.get(), empty_context_.network_delegate()));
+ request_.get(), NULL));
EXPECT_FALSE(handler_->MaybeLoadFallbackForRedirect(
- request_.get(),
- empty_context_.network_delegate(),
- GURL("ftp://blah/redirect")));
+ request_.get(), NULL, GURL("ftp://blah/redirect")));
EXPECT_FALSE(handler_->MaybeLoadFallbackForResponse(
- request_.get(), empty_context_.network_delegate()));
+ request_.get(), NULL));
TestFinished();
}
@@ -751,13 +729,13 @@ class AppCacheRequestHandlerTest : public testing::Test {
// CanceledRequest -----------------------------
void CanceledRequest() {
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::MAIN_FRAME));
EXPECT_TRUE(handler_.get());
- job_ = handler_->MaybeLoadResource(request_.get(),
- empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_TRUE(job_.get());
EXPECT_TRUE(job_->is_waiting());
EXPECT_FALSE(job_->has_been_started());
@@ -769,8 +747,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
request_->Cancel();
EXPECT_TRUE(job_->has_been_killed());
- EXPECT_FALSE(handler_->MaybeLoadFallbackForResponse(
- request_.get(), empty_context_.network_delegate()));
+ EXPECT_FALSE(handler_->MaybeLoadFallbackForResponse(request_.get(), NULL));
TestFinished();
}
@@ -787,7 +764,8 @@ class AppCacheRequestHandlerTest : public testing::Test {
EXPECT_FALSE(AppCacheRequestHandler::IsMainResourceType(
ResourceType::WORKER));
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
const int kParentHostId = host_->host_id();
const int kWorkerHostId = 2;
@@ -824,7 +802,8 @@ class AppCacheRequestHandlerTest : public testing::Test {
base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Blocked,
base::Unretained(this)));
- request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
+ request_.reset(new MockURLRequest(
+ GURL("http://blah/"), &empty_context_, empty_network_delegate_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::MAIN_FRAME));
EXPECT_TRUE(handler_.get());
@@ -835,8 +814,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
GURL(), AppCacheEntry(),
1, 2, GURL("http://blah/manifest/"));
- job_ = handler_->MaybeLoadResource(request_.get(),
- empty_context_.network_delegate());
+ job_ = handler_->MaybeLoadResource(request_.get(), NULL);
EXPECT_TRUE(job_.get());
EXPECT_TRUE(job_->is_waiting());
@@ -885,6 +863,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
scoped_ptr<MockAppCachePolicy> mock_policy_;
AppCacheHost* host_;
net::URLRequestContext empty_context_;
+ net::NetworkDelegate* empty_network_delegate_;
scoped_ptr<MockURLRequest> request_;
scoped_ptr<AppCacheRequestHandler> handler_;
scoped_refptr<AppCacheURLRequestJob> job_;
« net/url_request/url_request.h ('K') | « net/url_request/url_request.h ('k') | webkit/appcache/appcache_url_request_job_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698