chrome/browser/extensions/extension_webrequest_api_unittest.cc - Issue 7523042: Add a status message "Waiting for extension Foo..." when there's a request

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: comments Created 9 years, 5 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

« no previous file with comments | « chrome/browser/extensions/extension_webrequest_api.cc ('k') | chrome/browser/ui/tab_contents/tab_contents_wrapper.cc » ('j') | content/browser/renderer_host/resource_dispatcher_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 04f6cab7f44e2f95118e6fbb167ce5e1a1a8d2cb..dc386c5a3c2b70464d631a6a39512d95065d1714 100644

--- a/chrome/browser/extensions/extension_webrequest_api_unittest.cc

+++ b/chrome/browser/extensions/extension_webrequest_api_unittest.cc

@@ -109,12 +109,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");

@@ -240,13 +240,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_);