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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: extensions/browser/event_listener_map_unittest.cc

Issue 411733002: WIP: diff which plumbs through the event URL. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | « extensions/browser/event_listener_map.cc ('k') | extensions/browser/event_router.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/event_listener_map_unittest.cc
diff --git a/extensions/browser/event_listener_map_unittest.cc b/extensions/browser/event_listener_map_unittest.cc
index 9f4c5c3b1db60d57a1d9e6f9c7fd0aacff69e671..19b20b380e170e4f3580825abc9a78c956921f65 100644
--- a/extensions/browser/event_listener_map_unittest.cc
+++ b/extensions/browser/event_listener_map_unittest.cc
@@ -72,7 +72,7 @@ class EventListenerMapUnittest : public testing::Test {
TEST_F(EventListenerMapUnittest, UnfilteredEventsGoToAllListeners) {
listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent1Name, kExt1Id, NULL, scoped_ptr<DictionaryValue>())));
+ kEvent1Name, kExt1Id, GURL(), NULL, scoped_ptr<DictionaryValue>())));
scoped_ptr<Event> event(CreateNamedEvent(kEvent1Name));
std::set<const EventListener*> targets(listeners_->GetEventListeners(*event));
@@ -80,11 +80,18 @@ TEST_F(EventListenerMapUnittest, UnfilteredEventsGoToAllListeners) {
}
TEST_F(EventListenerMapUnittest, FilteredEventsGoToAllMatchingListeners) {
- listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent1Name, kExt1Id, NULL, CreateHostSuffixFilter("google.com"))));
- listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent1Name, kExt1Id, NULL, scoped_ptr<DictionaryValue>(
- new DictionaryValue))));
+ listeners_->AddListener(scoped_ptr<EventListener>(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ NULL,
+ CreateHostSuffixFilter("google.com"))));
+ listeners_->AddListener(scoped_ptr<EventListener>(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ NULL,
+ scoped_ptr<DictionaryValue>(new DictionaryValue))));
scoped_ptr<Event> event(CreateNamedEvent(kEvent1Name));
event->filter_info.SetURL(GURL("http://www.google.com"));
@@ -93,10 +100,18 @@ TEST_F(EventListenerMapUnittest, FilteredEventsGoToAllMatchingListeners) {
}
TEST_F(EventListenerMapUnittest, FilteredEventsOnlyGoToMatchingListeners) {
- listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent1Name, kExt1Id, NULL, CreateHostSuffixFilter("google.com"))));
- listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent1Name, kExt1Id, NULL, CreateHostSuffixFilter("yahoo.com"))));
+ listeners_->AddListener(scoped_ptr<EventListener>(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ NULL,
+ CreateHostSuffixFilter("google.com"))));
+ listeners_->AddListener(scoped_ptr<EventListener>(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ NULL,
+ CreateHostSuffixFilter("yahoo.com"))));
scoped_ptr<Event> event(CreateNamedEvent(kEvent1Name));
event->filter_info.SetURL(GURL("http://www.google.com"));
@@ -105,12 +120,19 @@ TEST_F(EventListenerMapUnittest, FilteredEventsOnlyGoToMatchingListeners) {
}
TEST_F(EventListenerMapUnittest, LazyAndUnlazyListenersGetReturned) {
- listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent1Name, kExt1Id, NULL, CreateHostSuffixFilter("google.com"))));
+ listeners_->AddListener(scoped_ptr<EventListener>(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ NULL,
+ CreateHostSuffixFilter("google.com"))));
- listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent1Name, kExt1Id, process_.get(),
- CreateHostSuffixFilter("google.com"))));
+ listeners_->AddListener(scoped_ptr<EventListener>(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ process_.get(),
+ CreateHostSuffixFilter("google.com"))));
scoped_ptr<Event> event(CreateNamedEvent(kEvent1Name));
event->filter_info.SetURL(GURL("http://www.google.com"));
@@ -119,12 +141,19 @@ TEST_F(EventListenerMapUnittest, LazyAndUnlazyListenersGetReturned) {
}
TEST_F(EventListenerMapUnittest, TestRemovingByProcess) {
- listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent1Name, kExt1Id, NULL, CreateHostSuffixFilter("google.com"))));
+ listeners_->AddListener(scoped_ptr<EventListener>(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ NULL,
+ CreateHostSuffixFilter("google.com"))));
- listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent1Name, kExt1Id, process_.get(),
- CreateHostSuffixFilter("google.com"))));
+ listeners_->AddListener(scoped_ptr<EventListener>(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ process_.get(),
+ CreateHostSuffixFilter("google.com"))));
listeners_->RemoveListenersForProcess(process_.get());
@@ -135,15 +164,26 @@ TEST_F(EventListenerMapUnittest, TestRemovingByProcess) {
}
TEST_F(EventListenerMapUnittest, TestRemovingByListener) {
- listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent1Name, kExt1Id, NULL, CreateHostSuffixFilter("google.com"))));
+ listeners_->AddListener(scoped_ptr<EventListener>(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ NULL,
+ CreateHostSuffixFilter("google.com"))));
- listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent1Name, kExt1Id, process_.get(),
- CreateHostSuffixFilter("google.com"))));
+ listeners_->AddListener(scoped_ptr<EventListener>(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ process_.get(),
+ CreateHostSuffixFilter("google.com"))));
- scoped_ptr<EventListener> listener(new EventListener(kEvent1Name, kExt1Id,
- process_.get(), CreateHostSuffixFilter("google.com")));
+ scoped_ptr<EventListener> listener(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ process_.get(),
+ CreateHostSuffixFilter("google.com")));
listeners_->RemoveListener(listener.get());
scoped_ptr<Event> event(CreateNamedEvent(kEvent1Name));
@@ -153,13 +193,25 @@ TEST_F(EventListenerMapUnittest, TestRemovingByListener) {
}
TEST_F(EventListenerMapUnittest, TestLazyDoubleAddIsUndoneByRemove) {
- listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent1Name, kExt1Id, NULL, CreateHostSuffixFilter("google.com"))));
- listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent1Name, kExt1Id, NULL, CreateHostSuffixFilter("google.com"))));
+ listeners_->AddListener(scoped_ptr<EventListener>(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ NULL,
+ CreateHostSuffixFilter("google.com"))));
+ listeners_->AddListener(scoped_ptr<EventListener>(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ NULL,
+ CreateHostSuffixFilter("google.com"))));
- scoped_ptr<EventListener> listener(new EventListener(
- kEvent1Name, kExt1Id, NULL, CreateHostSuffixFilter("google.com")));
+ scoped_ptr<EventListener> listener(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ NULL,
+ CreateHostSuffixFilter("google.com")));
listeners_->RemoveListener(listener.get());
scoped_ptr<Event> event(CreateNamedEvent(kEvent1Name));
@@ -175,10 +227,18 @@ TEST_F(EventListenerMapUnittest, HostSuffixFilterEquality) {
}
TEST_F(EventListenerMapUnittest, RemoveLazyListenersForExtension) {
- listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent1Name, kExt1Id, NULL, CreateHostSuffixFilter("google.com"))));
- listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
- kEvent2Name, kExt1Id, NULL, CreateHostSuffixFilter("google.com"))));
+ listeners_->AddListener(scoped_ptr<EventListener>(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ NULL,
+ CreateHostSuffixFilter("google.com"))));
+ listeners_->AddListener(scoped_ptr<EventListener>(
+ new EventListener(kEvent2Name,
+ kExt1Id,
+ GURL(),
+ NULL,
+ CreateHostSuffixFilter("google.com"))));
listeners_->RemoveLazyListenersForExtension(kExt1Id);
@@ -194,10 +254,16 @@ TEST_F(EventListenerMapUnittest, RemoveLazyListenersForExtension) {
TEST_F(EventListenerMapUnittest, AddExistingFilteredListener) {
bool first_new = listeners_->AddListener(scoped_ptr<EventListener>(
- new EventListener(kEvent1Name, kExt1Id, NULL,
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ NULL,
CreateHostSuffixFilter("google.com"))));
bool second_new = listeners_->AddListener(scoped_ptr<EventListener>(
- new EventListener(kEvent1Name, kExt1Id, NULL,
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ NULL,
CreateHostSuffixFilter("google.com"))));
ASSERT_TRUE(first_new);
@@ -205,16 +271,15 @@ TEST_F(EventListenerMapUnittest, AddExistingFilteredListener) {
}
TEST_F(EventListenerMapUnittest, AddExistingUnfilteredListener) {
- bool first_add = listeners_->AddListener(scoped_ptr<EventListener>(
- new EventListener(kEvent1Name, kExt1Id, NULL,
- scoped_ptr<DictionaryValue>())));
- bool second_add = listeners_->AddListener(scoped_ptr<EventListener>(
- new EventListener(kEvent1Name, kExt1Id, NULL,
- scoped_ptr<DictionaryValue>())));
+ bool first_add =
+ listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
+ kEvent1Name, kExt1Id, GURL(), NULL, scoped_ptr<DictionaryValue>())));
+ bool second_add =
+ listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
+ kEvent1Name, kExt1Id, GURL(), NULL, scoped_ptr<DictionaryValue>())));
- scoped_ptr<EventListener> listener(
- new EventListener(kEvent1Name, kExt1Id, NULL,
- scoped_ptr<DictionaryValue>()));
+ scoped_ptr<EventListener> listener(new EventListener(
+ kEvent1Name, kExt1Id, GURL(), NULL, scoped_ptr<DictionaryValue>()));
bool first_remove = listeners_->RemoveListener(listener.get());
bool second_remove = listeners_->RemoveListener(listener.get());
@@ -226,7 +291,10 @@ TEST_F(EventListenerMapUnittest, AddExistingUnfilteredListener) {
TEST_F(EventListenerMapUnittest, RemovingRouters) {
listeners_->AddListener(scoped_ptr<EventListener>(
- new EventListener(kEvent1Name, kExt1Id, process_.get(),
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ process_.get(),
scoped_ptr<DictionaryValue>())));
listeners_->RemoveListenersForProcess(process_.get());
ASSERT_FALSE(listeners_->HasListenerForEvent(kEvent1Name));
@@ -236,7 +304,10 @@ TEST_F(EventListenerMapUnittest, HasListenerForEvent) {
ASSERT_FALSE(listeners_->HasListenerForEvent(kEvent1Name));
listeners_->AddListener(scoped_ptr<EventListener>(
- new EventListener(kEvent1Name, kExt1Id, process_.get(),
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ process_.get(),
scoped_ptr<DictionaryValue>())));
ASSERT_FALSE(listeners_->HasListenerForEvent(kEvent2Name));
@@ -250,12 +321,14 @@ TEST_F(EventListenerMapUnittest, HasListenerForExtension) {
// Non-lazy listener.
listeners_->AddListener(scoped_ptr<EventListener>(
- new EventListener(kEvent1Name, kExt1Id, process_.get(),
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ process_.get(),
scoped_ptr<DictionaryValue>())));
// Lazy listener.
- listeners_->AddListener(scoped_ptr<EventListener>(
- new EventListener(kEvent1Name, kExt1Id, NULL,
- scoped_ptr<DictionaryValue>())));
+ listeners_->AddListener(scoped_ptr<EventListener>(new EventListener(
+ kEvent1Name, kExt1Id, GURL(), NULL, scoped_ptr<DictionaryValue>())));
ASSERT_FALSE(listeners_->HasListenerForExtension(kExt1Id, kEvent2Name));
ASSERT_TRUE(listeners_->HasListenerForExtension(kExt1Id, kEvent1Name));
@@ -283,8 +356,12 @@ TEST_F(EventListenerMapUnittest, AddLazyListenersFromPreferences) {
GURL("http://www.google.com")));
std::set<const EventListener*> targets(listeners_->GetEventListeners(*event));
ASSERT_EQ(1u, targets.size());
- scoped_ptr<EventListener> listener(new EventListener(kEvent1Name, kExt1Id,
- NULL, CreateHostSuffixFilter("google.com")));
+ scoped_ptr<EventListener> listener(
+ new EventListener(kEvent1Name,
+ kExt1Id,
+ GURL(),
+ NULL,
+ CreateHostSuffixFilter("google.com")));
ASSERT_TRUE((*targets.begin())->Equals(listener.get()));
}
« no previous file with comments | « extensions/browser/event_listener_map.cc ('k') | extensions/browser/event_router.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698