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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: extensions/browser/extension_protocols_unittest.cc

Issue 407093011: Allow URLRequests from one context to have different NetworkDelegates. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: And fix more stuff... Created 6 years, 5 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
« no previous file with comments | « content/browser/loader/resource_loader_unittest.cc ('k') | mojo/services/network/url_loader_impl.cc » ('j') | net/url_request/url_request.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/extension_protocols_unittest.cc
diff --git a/extensions/browser/extension_protocols_unittest.cc b/extensions/browser/extension_protocols_unittest.cc
index 02d9fdf65f461dd2fecf5233df2800f81ec160c7..1997b2a19c077003b814b4e5d7a71bc05c606d89 100644
--- a/extensions/browser/extension_protocols_unittest.cc
+++ b/extensions/browser/extension_protocols_unittest.cc
@@ -5,6 +5,7 @@
#include <string>
#include "base/file_util.h"
+#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
@@ -177,36 +178,40 @@ TEST_F(ExtensionProtocolTest, IncognitoRequest) {
// It doesn't matter that the resource doesn't exist. If the resource
// is blocked, we should see ADDRESS_UNREACHABLE. Otherwise, the request
// should just fail because the file doesn't exist.
- net::URLRequest request(extension->GetResourceURL("404.html"),
- net::DEFAULT_PRIORITY,
- &test_delegate_,
- resource_context_.GetRequestContext());
- StartRequest(&request, ResourceType::MAIN_FRAME);
- EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
+ scoped_ptr<net::URLRequest> request(
+ resource_context_.GetRequestContext()->CreateRequest(
+ extension->GetResourceURL("404.html"),
+ net::DEFAULT_PRIORITY,
+ &test_delegate_,
+ NULL));
+ StartRequest(request.get(), ResourceType::MAIN_FRAME);
+ EXPECT_EQ(net::URLRequestStatus::FAILED, request->status().status());
if (cases[i].should_allow_main_frame_load) {
- EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()) <<
+ EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request->status().error()) <<
cases[i].name;
} else {
- EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) <<
+ EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request->status().error()) <<
cases[i].name;
}
}
// Now do a subframe request.
{
- net::URLRequest request(extension->GetResourceURL("404.html"),
- net::DEFAULT_PRIORITY,
- &test_delegate_,
- resource_context_.GetRequestContext());
- StartRequest(&request, ResourceType::SUB_FRAME);
- EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
+ scoped_ptr<net::URLRequest> request(
+ resource_context_.GetRequestContext()->CreateRequest(
+ extension->GetResourceURL("404.html"),
+ net::DEFAULT_PRIORITY,
+ &test_delegate_,
+ NULL));
+ StartRequest(request.get(), ResourceType::SUB_FRAME);
+ EXPECT_EQ(net::URLRequestStatus::FAILED, request->status().status());
if (cases[i].should_allow_sub_frame_load) {
- EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error()) <<
+ EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request->status().error()) <<
cases[i].name;
} else {
- EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request.status().error()) <<
+ EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request->status().error()) <<
cases[i].name;
}
}
@@ -237,26 +242,30 @@ TEST_F(ExtensionProtocolTest, ComponentResourceRequest) {
// First test it with the extension enabled.
{
- net::URLRequest request(extension->GetResourceURL("webstore_icon_16.png"),
- net::DEFAULT_PRIORITY,
- &test_delegate_,
- resource_context_.GetRequestContext());
- StartRequest(&request, ResourceType::MEDIA);
- EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
- CheckForContentLengthHeader(&request);
+ scoped_ptr<net::URLRequest> request(
+ resource_context_.GetRequestContext()->CreateRequest(
+ extension->GetResourceURL("webstore_icon_16.png"),
+ net::DEFAULT_PRIORITY,
+ &test_delegate_,
+ NULL));
+ StartRequest(request.get(), ResourceType::MEDIA);
+ EXPECT_EQ(net::URLRequestStatus::SUCCESS, request->status().status());
+ CheckForContentLengthHeader(request.get());
}
// And then test it with the extension disabled.
extension_info_map_->RemoveExtension(extension->id(),
UnloadedExtensionInfo::REASON_DISABLE);
{
- net::URLRequest request(extension->GetResourceURL("webstore_icon_16.png"),
- net::DEFAULT_PRIORITY,
- &test_delegate_,
- resource_context_.GetRequestContext());
- StartRequest(&request, ResourceType::MEDIA);
- EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
- CheckForContentLengthHeader(&request);
+ scoped_ptr<net::URLRequest> request(
+ resource_context_.GetRequestContext()->CreateRequest(
+ extension->GetResourceURL("webstore_icon_16.png"),
+ net::DEFAULT_PRIORITY,
+ &test_delegate_,
+ NULL));
+ StartRequest(request.get(), ResourceType::MEDIA);
+ EXPECT_EQ(net::URLRequestStatus::SUCCESS, request->status().status());
+ CheckForContentLengthHeader(request.get());
}
}
@@ -273,26 +282,28 @@ TEST_F(ExtensionProtocolTest, ResourceRequestResponseHeaders) {
false);
{
- net::URLRequest request(extension->GetResourceURL("test.dat"),
- net::DEFAULT_PRIORITY,
- &test_delegate_,
- resource_context_.GetRequestContext());
- StartRequest(&request, ResourceType::MEDIA);
- EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
+ scoped_ptr<net::URLRequest> request(
+ resource_context_.GetRequestContext()->CreateRequest(
+ extension->GetResourceURL("test.dat"),
+ net::DEFAULT_PRIORITY,
+ &test_delegate_,
+ NULL));
+ StartRequest(request.get(), ResourceType::MEDIA);
+ EXPECT_EQ(net::URLRequestStatus::SUCCESS, request->status().status());
// Check that cache-related headers are set.
std::string etag;
- request.GetResponseHeaderByName("ETag", &etag);
+ request->GetResponseHeaderByName("ETag", &etag);
EXPECT_TRUE(StartsWithASCII(etag, "\"", false));
EXPECT_TRUE(EndsWith(etag, "\"", false));
std::string revalidation_header;
- request.GetResponseHeaderByName("cache-control", &revalidation_header);
+ request->GetResponseHeaderByName("cache-control", &revalidation_header);
EXPECT_EQ("no-cache", revalidation_header);
// We set test.dat as web-accessible, so it should have a CORS header.
std::string access_control;
- request.GetResponseHeaderByName("Access-Control-Allow-Origin",
+ request->GetResponseHeaderByName("Access-Control-Allow-Origin",
&access_control);
EXPECT_EQ("*", access_control);
}
@@ -312,30 +323,36 @@ TEST_F(ExtensionProtocolTest, AllowFrameRequests) {
// All MAIN_FRAME and SUB_FRAME requests should succeed.
{
- net::URLRequest request(extension->GetResourceURL("test.dat"),
- net::DEFAULT_PRIORITY,
- &test_delegate_,
- resource_context_.GetRequestContext());
- StartRequest(&request, ResourceType::MAIN_FRAME);
- EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
+ scoped_ptr<net::URLRequest> request(
+ resource_context_.GetRequestContext()->CreateRequest(
+ extension->GetResourceURL("test.dat"),
pauljensen 2014/07/31 15:38:17 two space indent for function call is wrong
mmenke 2014/07/31 16:03:14 Done. Also fixed the others in this file you didn
+ net::DEFAULT_PRIORITY,
+ &test_delegate_,
+ NULL));
+ StartRequest(request.get(), ResourceType::MAIN_FRAME);
+ EXPECT_EQ(net::URLRequestStatus::SUCCESS, request->status().status());
}
{
- net::URLRequest request(extension->GetResourceURL("test.dat"),
- net::DEFAULT_PRIORITY,
- &test_delegate_,
- resource_context_.GetRequestContext());
- StartRequest(&request, ResourceType::SUB_FRAME);
- EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
+ scoped_ptr<net::URLRequest> request(
+ resource_context_.GetRequestContext()->CreateRequest(
+ extension->GetResourceURL("test.dat"),
pauljensen 2014/07/31 15:38:17 ditto
mmenke 2014/07/31 16:03:14 Done.
+ net::DEFAULT_PRIORITY,
+ &test_delegate_,
+ NULL));
+ StartRequest(request.get(), ResourceType::SUB_FRAME);
+ EXPECT_EQ(net::URLRequestStatus::SUCCESS, request->status().status());
}
// And subresource types, such as media, should fail.
{
- net::URLRequest request(extension->GetResourceURL("test.dat"),
- net::DEFAULT_PRIORITY,
- &test_delegate_,
- resource_context_.GetRequestContext());
- StartRequest(&request, ResourceType::MEDIA);
- EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
+ scoped_ptr<net::URLRequest> request(
+ resource_context_.GetRequestContext()->CreateRequest(
+ extension->GetResourceURL("test.dat"),
pauljensen 2014/07/31 15:38:17 ditto
mmenke 2014/07/31 16:03:14 Done.
+ net::DEFAULT_PRIORITY,
+ &test_delegate_,
+ NULL));
+ StartRequest(request.get(), ResourceType::MEDIA);
+ EXPECT_EQ(net::URLRequestStatus::FAILED, request->status().status());
}
}
« no previous file with comments | « content/browser/loader/resource_loader_unittest.cc ('k') | mojo/services/network/url_loader_impl.cc » ('j') | net/url_request/url_request.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698