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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/appcache/appcache_request_handler_unittest.cc

Issue 2525743002: Make URLRequestContext a MemoryDumpProvider (Abandoned) (Closed)
Patch Set: Fix test Created 4 years, 1 month 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
« chrome/browser/io_thread.cc ('K') | « chromecast/net/fake_stream_socket.cc ('k') | content/browser/renderer_host/p2p/socket_host_test_utils.h » ('j') | jingle/glue/proxy_resolving_client_socket.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8367bc8b1f3bea727ee64ec62fc227826b59dd14..b001efd0102e3406d38578cbbad0c282721182be 100644
--- a/content/browser/appcache/appcache_request_handler_unittest.cc
+++ b/content/browser/appcache/appcache_request_handler_unittest.cc
@@ -215,7 +215,8 @@ class AppCacheRequestHandlerTest : public testing::Test {
void SetUpTest() {
DCHECK(io_thread_->task_runner()->BelongsToCurrentThread());
mock_service_.reset(new MockAppCacheService);
- mock_service_->set_request_context(&empty_context_);
+ empty_context_.reset(new net::URLRequestContext);
+ mock_service_->set_request_context(empty_context_.get());
mock_policy_.reset(new MockAppCachePolicy);
mock_service_->set_appcache_policy(mock_policy_.get());
mock_frontend_.reset(new MockFrontend);
@@ -226,7 +227,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
backend_impl_->RegisterHost(kHostId);
host_ = backend_impl_->GetHost(kHostId);
job_factory_.reset(new MockURLRequestJobFactory());
- empty_context_.set_job_factory(job_factory_.get());
+ empty_context_->set_job_factory(job_factory_.get());
}
void TearDownTest() {
@@ -239,6 +240,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_service_.reset();
mock_policy_.reset();
job_factory_.reset();
+ empty_context_.reset();
host_ = NULL;
}
@@ -277,7 +279,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Miss,
base::Unretained(this)));
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_MAIN_FRAME,
@@ -325,7 +327,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Hit,
base::Unretained(this)));
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_MAIN_FRAME,
@@ -375,7 +377,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Fallback,
base::Unretained(this)));
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_MAIN_FRAME,
@@ -457,7 +459,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
&AppCacheRequestHandlerTest::Verify_MainResource_FallbackOverride,
base::Unretained(this)));
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/fallback-override"), net::DEFAULT_PRIORITY,
&delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
@@ -523,7 +525,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
// SubResource_Miss_WithNoCacheSelected ----------------------------------
void SubResource_Miss_WithNoCacheSelected() {
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_SUB_RESOURCE,
@@ -543,7 +545,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
// in a network or fallback namespace, should result in a failed request.
host_->AssociateCompleteCache(MakeNewCache());
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_SUB_RESOURCE,
@@ -575,7 +577,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
host_->pending_selected_cache_id_ = cache->cache_id();
host_->set_preferred_manifest_url(cache->owning_group()->manifest_url());
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_SUB_RESOURCE,
@@ -610,7 +612,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false);
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_SUB_RESOURCE,
@@ -643,7 +645,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(), AppCacheEntry(AppCacheEntry::EXPLICIT, 1), false);
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_SUB_RESOURCE,
@@ -677,7 +679,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(), AppCacheEntry(AppCacheEntry::EXPLICIT, 1), false);
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_SUB_RESOURCE,
@@ -712,7 +714,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(), AppCacheEntry(), true);
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_SUB_RESOURCE,
@@ -742,7 +744,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false);
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_SUB_RESOURCE,
@@ -770,7 +772,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
// Precondition, the host is waiting on cache selection.
host_->pending_selected_cache_id_ = 1;
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_SUB_RESOURCE,
@@ -806,7 +808,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false);
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_SUB_RESOURCE,
@@ -836,7 +838,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
}
void DestroyedServiceWithCrossSiteNav() {
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_MAIN_FRAME,
@@ -870,7 +872,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
// Precondition, the host is waiting on cache selection.
host_->pending_selected_cache_id_ = 1;
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("ftp://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_SUB_RESOURCE,
@@ -892,7 +894,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
// CanceledRequest -----------------------------
void CanceledRequest() {
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_MAIN_FRAME,
@@ -933,7 +935,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
EXPECT_FALSE(AppCacheRequestHandler::IsMainResourceType(
RESOURCE_TYPE_WORKER));
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
const int kParentHostId = host_->host_id();
@@ -971,7 +973,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Blocked,
base::Unretained(this)));
- request_ = empty_context_.CreateRequest(
+ request_ = empty_context_->CreateRequest(
GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_);
handler_.reset(host_->CreateRequestHandler(request_.get(),
RESOURCE_TYPE_MAIN_FRAME,
@@ -1033,7 +1035,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
std::unique_ptr<MockFrontend> mock_frontend_;
std::unique_ptr<MockAppCachePolicy> mock_policy_;
AppCacheHost* host_;
- net::URLRequestContext empty_context_;
+ std::unique_ptr<net::URLRequestContext> empty_context_;
std::unique_ptr<MockURLRequestJobFactory> job_factory_;
MockURLRequestDelegate delegate_;
std::unique_ptr<net::URLRequest> request_;
« chrome/browser/io_thread.cc ('K') | « chromecast/net/fake_stream_socket.cc ('k') | content/browser/renderer_host/p2p/socket_host_test_utils.h » ('j') | jingle/glue/proxy_resolving_client_socket.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698