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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/appcache/appcache_request_handler_unittest.cc

Issue 10559036: Added URLRequestContext to constructor for URLRequest. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Converted new unittest. Created 8 years, 6 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
« remoting/host/url_fetcher.cc ('K') | « remoting/host/url_fetcher.cc ('k') | webkit/appcache/appcache_update_job.cc » ('j') | webkit/appcache/appcache_url_request_job_unittest.cc » ('J')
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 98f41a8ed3728a390f04d3436548c3f88fc395de..abafa916daf7bc8b42972252007c8e3e465d7bbb 100644
--- a/webkit/appcache/appcache_request_handler_unittest.cc
+++ b/webkit/appcache/appcache_request_handler_unittest.cc
@@ -15,6 +15,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.h"
@@ -107,7 +108,9 @@ class AppCacheRequestHandlerTest : public testing::Test {
class MockURLRequest : public net::URLRequest {
public:
- explicit MockURLRequest(const GURL& url) : net::URLRequest(url, NULL) {}
+ explicit MockURLRequest(const GURL& url, net::URLRequestContext* context) :
+ net::URLRequest(url, NULL, context) {
+ }
void SimulateResponseCode(int http_response_code) {
mock_factory_job_ = new MockURLRequestJob(this, http_response_code);
@@ -154,8 +157,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
// Test harness --------------------------------------------------
- AppCacheRequestHandlerTest()
- : host_(NULL), orig_http_factory_(NULL) {
+ AppCacheRequestHandlerTest() : host_(NULL), orig_http_factory_(NULL) {
}
template <class Method>
@@ -236,7 +238,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Miss,
base::Unretained(this)));
- request_.reset(new MockURLRequest(GURL("http://blah/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::MAIN_FRAME));
EXPECT_TRUE(handler_.get());
@@ -279,7 +281,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Hit,
base::Unretained(this)));
- request_.reset(new MockURLRequest(GURL("http://blah/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::MAIN_FRAME));
EXPECT_TRUE(handler_.get());
@@ -325,7 +327,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Fallback,
base::Unretained(this)));
- request_.reset(new MockURLRequest(GURL("http://blah/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::MAIN_FRAME));
EXPECT_TRUE(handler_.get());
@@ -382,7 +384,8 @@ class AppCacheRequestHandlerTest : public testing::Test {
&AppCacheRequestHandlerTest::Verify_MainResource_FallbackOverride,
base::Unretained(this)));
- request_.reset(new MockURLRequest(GURL("http://blah/fallback-override")));
+ request_.reset(new MockURLRequest(GURL("http://blah/fallback-override"),
+ &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::MAIN_FRAME));
EXPECT_TRUE(handler_.get());
@@ -431,7 +434,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
// SubResource_Miss_WithNoCacheSelected ----------------------------------
void SubResource_Miss_WithNoCacheSelected() {
- request_.reset(new MockURLRequest(GURL("http://blah/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
@@ -449,7 +452,7 @@ 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/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
@@ -476,7 +479,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_.reset(new MockURLRequest(GURL("http://blah/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
@@ -506,7 +509,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false);
- request_.reset(new MockURLRequest(GURL("http://blah/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
@@ -534,7 +537,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(), AppCacheEntry(AppCacheEntry::EXPLICIT, 1), false);
- request_.reset(new MockURLRequest(GURL("http://blah/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
@@ -563,7 +566,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(), AppCacheEntry(AppCacheEntry::EXPLICIT, 1), false);
- request_.reset(new MockURLRequest(GURL("http://blah/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
@@ -593,7 +596,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(), AppCacheEntry(), true);
- request_.reset(new MockURLRequest(GURL("http://blah/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
@@ -618,7 +621,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
mock_storage()->SimulateFindSubResource(
AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false);
- request_.reset(new MockURLRequest(GURL("http://blah/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
@@ -640,7 +643,7 @@ 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/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get());
@@ -667,7 +670,7 @@ 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/")));
+ request_.reset(new MockURLRequest(GURL("ftp://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::SUB_RESOURCE));
EXPECT_TRUE(handler_.get()); // we could redirect to http (conceivably)
@@ -683,7 +686,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
// CanceledRequest -----------------------------
void CanceledRequest() {
- request_.reset(new MockURLRequest(GURL("http://blah/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::MAIN_FRAME));
EXPECT_TRUE(handler_.get());
@@ -717,7 +720,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
EXPECT_FALSE(AppCacheRequestHandler::IsMainResourceType(
ResourceType::WORKER));
- request_.reset(new MockURLRequest(GURL("http://blah/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
const int kParentHostId = host_->host_id();
const int kWorkerHostId = 2;
@@ -754,7 +757,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Blocked,
base::Unretained(this)));
- request_.reset(new MockURLRequest(GURL("http://blah/")));
+ request_.reset(new MockURLRequest(GURL("http://blah/"), &empty_context_));
handler_.reset(host_->CreateRequestHandler(request_.get(),
ResourceType::MAIN_FRAME));
EXPECT_TRUE(handler_.get());
@@ -813,6 +816,7 @@ class AppCacheRequestHandlerTest : public testing::Test {
scoped_ptr<MockFrontend> mock_frontend_;
scoped_ptr<MockAppCachePolicy> mock_policy_;
AppCacheHost* host_;
+ net::URLRequestContext empty_context_;
mmenke 2012/06/20 18:33:50 Suggest a warning that order matters here, like wi
scoped_ptr<MockURLRequest> request_;
scoped_ptr<AppCacheRequestHandler> handler_;
scoped_refptr<AppCacheURLRequestJob> job_;
« remoting/host/url_fetcher.cc ('K') | « remoting/host/url_fetcher.cc ('k') | webkit/appcache/appcache_update_job.cc » ('j') | webkit/appcache/appcache_url_request_job_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698