Index: extensions/browser/extension_protocols_unittest.cc |
diff --git a/extensions/browser/extension_protocols_unittest.cc b/extensions/browser/extension_protocols_unittest.cc |
index e2f0607f3f79ebeec0cec33b9fccc57fcc0c3268..e9aea853e65f33111e2e4c48348d19093c621b70 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, content::RESOURCE_TYPE_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(), content::RESOURCE_TYPE_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, content::RESOURCE_TYPE_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(), content::RESOURCE_TYPE_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, content::RESOURCE_TYPE_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(), content::RESOURCE_TYPE_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, content::RESOURCE_TYPE_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(), content::RESOURCE_TYPE_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, content::RESOURCE_TYPE_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(), content::RESOURCE_TYPE_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, content::RESOURCE_TYPE_MAIN_FRAME); |
- 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(), content::RESOURCE_TYPE_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, content::RESOURCE_TYPE_SUB_FRAME); |
- 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(), content::RESOURCE_TYPE_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, content::RESOURCE_TYPE_MEDIA); |
- EXPECT_EQ(net::URLRequestStatus::FAILED, 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(), content::RESOURCE_TYPE_MEDIA); |
+ EXPECT_EQ(net::URLRequestStatus::FAILED, request->status().status()); |
} |
} |