Chromium Code Reviews| Index: chrome/browser/extensions/extension_protocols_unittest.cc |
| diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc |
| index e323cd5d2f9d26f2568abc8eb9aef89ecb4da0ed..b5f2d69d4dfb94433e56a17653ecf2d719ecd007 100644 |
| --- a/chrome/browser/extensions/extension_protocols_unittest.cc |
| +++ b/chrome/browser/extensions/extension_protocols_unittest.cc |
| @@ -18,6 +18,7 @@ |
| #include "content/public/test/mock_resource_context.h" |
| #include "content/public/test/test_browser_thread_bundle.h" |
| #include "extensions/common/constants.h" |
| +#include "net/base/request_priority.h" |
| #include "net/url_request/url_request.h" |
| #include "net/url_request/url_request_job_factory_impl.h" |
| #include "net/url_request/url_request_status.h" |
| @@ -170,8 +171,10 @@ TEST_F(ExtensionProtocolTest, IncognitoRequest) { |
| // 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()); |
| + resource_context_.GetRequestContext(), |
| + NULL); |
|
mmenke
2013/10/30 15:27:11
I don't think we should depend on the resource con
akalin
2013/10/30 21:44:37
From our chat, making the 'deprecated' constructor
|
| StartRequest(&request, ResourceType::MAIN_FRAME); |
| EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); |
| @@ -187,8 +190,10 @@ TEST_F(ExtensionProtocolTest, IncognitoRequest) { |
| // Now do a subframe request. |
| { |
| net::URLRequest request(extension->GetResourceURL("404.html"), |
| + net::DEFAULT_PRIORITY, |
| &test_delegate_, |
| - resource_context_.GetRequestContext()); |
| + resource_context_.GetRequestContext(), |
| + NULL); |
| StartRequest(&request, ResourceType::SUB_FRAME); |
| EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status()); |
| @@ -225,8 +230,10 @@ 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()); |
| + resource_context_.GetRequestContext(), |
| + NULL); |
| StartRequest(&request, ResourceType::MEDIA); |
| EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status()); |
| CheckForContentLengthHeader(&request); |
| @@ -237,8 +244,10 @@ TEST_F(ExtensionProtocolTest, ComponentResourceRequest) { |
| UnloadedExtensionInfo::REASON_DISABLE); |
| { |
| net::URLRequest request(extension->GetResourceURL("webstore_icon_16.png"), |
| + net::DEFAULT_PRIORITY, |
| &test_delegate_, |
| - resource_context_.GetRequestContext()); |
| + resource_context_.GetRequestContext(), |
| + NULL); |
| StartRequest(&request, ResourceType::MEDIA); |
| EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status()); |
| CheckForContentLengthHeader(&request); |
| @@ -256,8 +265,10 @@ TEST_F(ExtensionProtocolTest, ResourceRequestResponseHeaders) { |
| { |
| net::URLRequest request(extension->GetResourceURL("test.dat"), |
| + net::DEFAULT_PRIORITY, |
| &test_delegate_, |
| - resource_context_.GetRequestContext()); |
| + resource_context_.GetRequestContext(), |
| + NULL); |
| StartRequest(&request, ResourceType::MEDIA); |
| EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status()); |