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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

Issue 1272373003: Add extension event histogram values for messaging, webRequest, and webview. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: devlin Created 5 years, 4 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
« chrome/browser/extensions/api/messaging/message_service.cc ('K') | « chrome/browser/extensions/api/messaging/message_service.cc ('k') | extensions/browser/api/web_request/web_request_api.h » ('j') | extensions/browser/event_router.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b239c63ad00d0c0bf1787d288224a85823510dee..97c39d018f095651b3aebde8258f2ab8a51fa025 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
@@ -227,12 +227,14 @@ TEST_F(ExtensionWebRequestTest, BlockingEventPrecedenceRedirect) {
const std::string kEventName(web_request::OnBeforeRequest::kEventName);
base::WeakPtrFactory<TestIPCSender> ipc_sender_factory(&ipc_sender_);
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
- &profile_, extension1_id, extension1_id, kEventName, kEventName + "/1",
- filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 0, 0,
+ &profile_, extension1_id, extension1_id, events::FOR_TEST, kEventName,
+ kEventName + "/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, 0, 0,
+ &profile_, extension2_id, extension2_id, events::FOR_TEST, kEventName,
+ kEventName + "/2", filter,
+ ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 0, 0,
ipc_sender_factory.GetWeakPtr());
net::URLRequestJobFactoryImpl job_factory;
@@ -363,13 +365,15 @@ TEST_F(ExtensionWebRequestTest, BlockingEventPrecedenceCancel) {
const std::string kEventName(web_request::OnBeforeRequest::kEventName);
base::WeakPtrFactory<TestIPCSender> ipc_sender_factory(&ipc_sender_);
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
- &profile_, extension1_id, extension1_id, kEventName, kEventName + "/1",
- filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 0, 0,
- ipc_sender_factory.GetWeakPtr());
+ &profile_, extension1_id, extension1_id, events::FOR_TEST, kEventName,
+ kEventName + "/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, 0, 0,
- ipc_sender_factory.GetWeakPtr());
+ &profile_, extension2_id, extension2_id, events::FOR_TEST, kEventName,
+ kEventName + "/2", filter,
+ ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 0, 0,
+ ipc_sender_factory.GetWeakPtr());
GURL request_url("about:blank");
scoped_ptr<net::URLRequest> request(context_->CreateRequest(
@@ -432,12 +436,13 @@ TEST_F(ExtensionWebRequestTest, SimulateChancelWhileBlocked) {
const std::string kEventName2(web_request::OnErrorOccurred::kEventName);
base::WeakPtrFactory<TestIPCSender> ipc_sender_factory(&ipc_sender_);
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
- &profile_, extension_id, extension_id, kEventName, kEventName + "/1",
- filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 0, 0,
- ipc_sender_factory.GetWeakPtr());
+ &profile_, extension_id, extension_id, events::FOR_TEST, kEventName,
+ kEventName + "/1", filter,
+ ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 0, 0,
+ ipc_sender_factory.GetWeakPtr());
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
- &profile_, extension_id, extension_id, kEventName2, kEventName2 + "/1",
- filter, 0, 0, 0, ipc_sender_factory.GetWeakPtr());
+ &profile_, extension_id, extension_id, events::FOR_TEST, kEventName2,
+ kEventName2 + "/1", filter, 0, 0, 0, ipc_sender_factory.GetWeakPtr());
GURL request_url("about:blank");
scoped_ptr<net::URLRequest> request(context_->CreateRequest(
@@ -632,8 +637,9 @@ TEST_F(ExtensionWebRequestTest, AccessRequestBodyData) {
// Subscribe to OnBeforeRequest with requestBody requirement.
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, 0, 0, ipc_sender_factory.GetWeakPtr());
+ &profile_, extension_id, extension_id, events::FOR_TEST, kEventName,
+ kEventName + "/1", filter, extra_info_spec_body, 0, 0,
+ ipc_sender_factory.GetWeakPtr());
FireURLRequestWithData(kMethodPost, kMultipart, form_1, form_2);
@@ -648,8 +654,9 @@ TEST_F(ExtensionWebRequestTest, AccessRequestBodyData) {
ASSERT_TRUE(
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, 0, 0, ipc_sender_factory.GetWeakPtr());
+ &profile_, extension_id, extension_id, events::FOR_TEST, kEventName,
+ kEventName + "/1", filter, extra_info_spec_empty, 0, 0,
+ ipc_sender_factory.GetWeakPtr());
FireURLRequestWithData(kMethodPost, kMultipart, form_1, form_2);
@@ -658,8 +665,9 @@ 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, 0, 0, ipc_sender_factory.GetWeakPtr());
+ &profile_, extension_id, extension_id, events::FOR_TEST, kEventName,
+ kEventName + "/1", 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.
@@ -716,8 +724,9 @@ 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, 0, 0, ipc_sender_factory.GetWeakPtr());
+ &profile_, extension_id, extension_id, events::FOR_TEST, kEventName,
+ kEventName + "/1", 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");
@@ -828,20 +837,22 @@ TEST_P(ExtensionWebRequestHeaderModificationTest, TestModifications) {
// Install two extensions that can modify headers. Extension 2 has
// higher precedence than extension 1.
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
- &profile_, extension1_id, extension1_id, kEventName, kEventName + "/1",
- filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING, 0, 0,
+ &profile_, extension1_id, extension1_id, events::FOR_TEST, kEventName,
+ kEventName + "/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, 0, 0,
+ &profile_, extension2_id, extension2_id, events::FOR_TEST, kEventName,
+ kEventName + "/2", 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, 0, 0,
- ipc_sender_factory.GetWeakPtr());
+ &profile_, extension3_id, extension3_id, events::FOR_TEST,
+ keys::kOnSendHeadersEvent, std::string(keys::kOnSendHeadersEvent) + "/3",
+ filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::REQUEST_HEADERS, 0,
+ 0, ipc_sender_factory.GetWeakPtr());
GURL request_url("http://doesnotexist/does_not_exist.html");
scoped_ptr<net::URLRequest> request(context_->CreateRequest(
« chrome/browser/extensions/api/messaging/message_service.cc ('K') | « chrome/browser/extensions/api/messaging/message_service.cc ('k') | extensions/browser/api/web_request/web_request_api.h » ('j') | extensions/browser/event_router.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698