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

Unified Diff: chrome/browser/extensions/extension_webrequest_api_unittest.cc

Issue 7523042: Add a status message "Waiting for extension Foo..." when there's a request (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final Created 9 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
Index: chrome/browser/extensions/extension_webrequest_api_unittest.cc
diff --git a/chrome/browser/extensions/extension_webrequest_api_unittest.cc b/chrome/browser/extensions/extension_webrequest_api_unittest.cc
index 8f84b08da724ebf4375319c21e0969db3e32ccc1..6be25ba52124e84d3458a9ab91281f2adcf11596 100644
--- a/chrome/browser/extensions/extension_webrequest_api_unittest.cc
+++ b/chrome/browser/extensions/extension_webrequest_api_unittest.cc
@@ -111,12 +111,12 @@ TEST_F(ExtensionWebRequestTest, BlockingEventPrecedenceRedirect) {
const std::string kEventName(keys::kOnBeforeRequest);
base::WeakPtrFactory<TestIPCSender> ipc_sender_factory(&ipc_sender_);
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
- &profile_, extension1_id, kEventName, kEventName + "/1", filter,
- ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING,
+ &profile_, extension1_id, extension1_id, kEventName, kEventName + "/1",
+ filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING,
ipc_sender_factory.GetWeakPtr());
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
- &profile_, extension2_id, kEventName, kEventName + "/2", filter,
- ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING,
+ &profile_, extension2_id, extension2_id, kEventName, kEventName + "/2",
+ filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING,
ipc_sender_factory.GetWeakPtr());
GURL redirect_url("about:redirected");
@@ -242,13 +242,13 @@ TEST_F(ExtensionWebRequestTest, BlockingEventPrecedenceCancel) {
const std::string kEventName(keys::kOnBeforeRequest);
base::WeakPtrFactory<TestIPCSender> ipc_sender_factory(&ipc_sender_);
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
- &profile_, extension1_id, kEventName, kEventName + "/1", filter,
- ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING,
- ipc_sender_factory.GetWeakPtr());
+ &profile_, extension1_id, extension1_id, kEventName, kEventName + "/1",
+ filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING,
+ ipc_sender_factory.GetWeakPtr());
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
- &profile_, extension2_id, kEventName, kEventName + "/2", filter,
- ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING,
- ipc_sender_factory.GetWeakPtr());
+ &profile_, extension2_id, extension2_id, kEventName, kEventName + "/2",
+ filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING,
+ ipc_sender_factory.GetWeakPtr());
GURL request_url("about:blank");
net::URLRequest request(request_url, &delegate_);
@@ -363,17 +363,17 @@ 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, kEventName, kEventName + "/1", filter,
- ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING,
+ &profile_, extension1_id, extension1_id, kEventName, kEventName + "/1",
+ filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING,
ipc_sender_factory.GetWeakPtr());
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
- &profile_, extension2_id, kEventName, kEventName + "/2", filter,
- ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING,
+ &profile_, extension2_id, extension2_id, kEventName, kEventName + "/2",
+ filter, ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING,
ipc_sender_factory.GetWeakPtr());
// Install one extension that observes the final headers.
ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
- &profile_, extension3_id, keys::kOnSendHeaders,
+ &profile_, extension3_id, extension3_id, keys::kOnSendHeaders,
std::string(keys::kOnSendHeaders) + "/3", filter,
ExtensionWebRequestEventRouter::ExtraInfoSpec::REQUEST_HEADERS,
ipc_sender_factory.GetWeakPtr());
« no previous file with comments | « chrome/browser/extensions/extension_webrequest_api.cc ('k') | chrome/browser/ui/tab_contents/tab_contents_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698