Index: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc |
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc |
index c867fababe2247556ac955e8be19fdb8cc17c36e..354763a21b206a05996fdf7febdd11e9cd3981a8 100644 |
--- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc |
+++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc |
@@ -223,11 +223,11 @@ TEST_F(ExtensionWebRequestTest, BlockingEventPrecedenceRedirect) { |
base::WeakPtrFactory<TestIPCSender> ipc_sender_factory(&ipc_sender_); |
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( |
&profile_, extension1_id, extension1_id, kEventName, kEventName + "/1", |
- filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, -1, -1, |
+ filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 0, 0, |
ipc_sender_factory.GetWeakPtr()); |
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( |
&profile_, extension2_id, extension2_id, kEventName, kEventName + "/2", |
- filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, -1, -1, |
+ filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 0, 0, |
ipc_sender_factory.GetWeakPtr()); |
net::URLRequestJobFactoryImpl job_factory; |
@@ -359,11 +359,11 @@ TEST_F(ExtensionWebRequestTest, BlockingEventPrecedenceCancel) { |
base::WeakPtrFactory<TestIPCSender> ipc_sender_factory(&ipc_sender_); |
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( |
&profile_, extension1_id, extension1_id, kEventName, kEventName + "/1", |
- filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, -1, -1, |
+ filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 0, 0, |
ipc_sender_factory.GetWeakPtr()); |
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( |
&profile_, extension2_id, extension2_id, kEventName, kEventName + "/2", |
- filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, -1, -1, |
+ filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 0, 0, |
ipc_sender_factory.GetWeakPtr()); |
GURL request_url("about:blank"); |
@@ -428,11 +428,11 @@ TEST_F(ExtensionWebRequestTest, SimulateChancelWhileBlocked) { |
base::WeakPtrFactory<TestIPCSender> ipc_sender_factory(&ipc_sender_); |
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( |
&profile_, extension_id, extension_id, kEventName, kEventName + "/1", |
- filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, -1, -1, |
+ filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 0, 0, |
ipc_sender_factory.GetWeakPtr()); |
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( |
&profile_, extension_id, extension_id, kEventName2, kEventName2 + "/1", |
- filter, 0, -1, -1, ipc_sender_factory.GetWeakPtr()); |
+ filter, 0, 0, 0, ipc_sender_factory.GetWeakPtr()); |
GURL request_url("about:blank"); |
scoped_ptr<net::URLRequest> request(context_->CreateRequest( |
@@ -625,7 +625,7 @@ TEST_F(ExtensionWebRequestTest, AccessRequestBodyData) { |
ASSERT_TRUE(GenerateInfoSpec(string_spec_post, &extra_info_spec_body)); |
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( |
&profile_, extension_id, extension_id, kEventName, kEventName + "/1", |
- filter, extra_info_spec_body, -1, -1, ipc_sender_factory.GetWeakPtr()); |
+ filter, extra_info_spec_body, 0, 0, ipc_sender_factory.GetWeakPtr()); |
FireURLRequestWithData(kMethodPost, kMultipart, form_1, form_2); |
@@ -641,7 +641,7 @@ TEST_F(ExtensionWebRequestTest, AccessRequestBodyData) { |
GenerateInfoSpec(string_spec_no_post, &extra_info_spec_empty)); |
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( |
&profile_, extension_id, extension_id, kEventName, kEventName + "/1", |
- filter, extra_info_spec_empty, -1, -1, ipc_sender_factory.GetWeakPtr()); |
+ filter, extra_info_spec_empty, 0, 0, ipc_sender_factory.GetWeakPtr()); |
FireURLRequestWithData(kMethodPost, kMultipart, form_1, form_2); |
@@ -651,7 +651,7 @@ TEST_F(ExtensionWebRequestTest, AccessRequestBodyData) { |
// Subscribe to OnBeforeRequest with requestBody requirement. |
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( |
&profile_, extension_id, extension_id, kEventName, kEventName + "/1", |
- filter, extra_info_spec_body, -1, -1, ipc_sender_factory.GetWeakPtr()); |
+ filter, extra_info_spec_body, 0, 0, ipc_sender_factory.GetWeakPtr()); |
// Part 3. |
// Now send a POST request with body which is not parseable as a form. |
@@ -709,7 +709,7 @@ TEST_F(ExtensionWebRequestTest, NoAccessRequestBodyData) { |
// Subscribe to OnBeforeRequest with requestBody requirement. |
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( |
&profile_, extension_id, extension_id, kEventName, kEventName + "/1", |
- filter, extra_info_spec, -1, -1, ipc_sender_factory.GetWeakPtr()); |
+ filter, extra_info_spec, 0, 0, ipc_sender_factory.GetWeakPtr()); |
// The request URL can be arbitrary but must have an HTTP or HTTPS scheme. |
const GURL request_url("http://www.example.com"); |
@@ -821,18 +821,18 @@ TEST_P(ExtensionWebRequestHeaderModificationTest, TestModifications) { |
// higher precedence than extension 1. |
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( |
&profile_, extension1_id, extension1_id, kEventName, kEventName + "/1", |
- filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, -1, -1, |
+ filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 0, 0, |
ipc_sender_factory.GetWeakPtr()); |
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( |
&profile_, extension2_id, extension2_id, kEventName, kEventName + "/2", |
- filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, -1, -1, |
+ filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 0, 0, |
ipc_sender_factory.GetWeakPtr()); |
// Install one extension that observes the final headers. |
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener( |
&profile_, extension3_id, extension3_id, keys::kOnSendHeadersEvent, |
std::string(keys::kOnSendHeadersEvent) + "/3", filter, |
- ExtensionWebRequestEventRouter::ExtraInfoSpec::REQUEST_HEADERS, -1, -1, |
+ ExtensionWebRequestEventRouter::ExtraInfoSpec::REQUEST_HEADERS, 0, 0, |
ipc_sender_factory.GetWeakPtr()); |
GURL request_url("http://doesnotexist/does_not_exist.html"); |