Remove deprecated extension EventRouter APIs.

Remove deprecated extension EventRouter APIs.

BUG=163246
TBR=tommi@chromium.org
TBR=sky@chromium.org
TBR=dmazzoni@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=171719

[Matt Perry, 2012-12-05 21:35:21]

Sorry, lots of small changes in this one.

[Yoyo Zhou, 2012-12-05 22:28:32]

LGTM

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/bookmarks/...
File chrome/browser/bookmarks/bookmark_extension_api.cc (right):

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/bookmarks/...
chrome/browser/bookmarks/bookmark_extension_api.cc:154:
scoped_ptr<extensions::Event> event(new extensions::Event(
You might be able to use make_scoped_ptr to inline event in those places where
you don't need to add fields to it. I don't have a strong opinion on this
though.

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
File chrome/browser/extensions/api/api_resource_event_notifier.cc (left):

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
chrome/browser/extensions/api/api_resource_event_notifier.cc:46: void
ApiResourceEventNotifier::DispatchEvent(const std::string &extension,
Is this indicative of a bug?

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
File chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc (right):

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc:210:
scoped_ptr<extensions::Event> event(new extensions::Event(
this is in the extensions namespace.

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
File chrome/browser/extensions/api/omnibox/omnibox_api.cc (right):

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
chrome/browser/extensions/api/omnibox/omnibox_api.cc:50:
events::kOnInputStarted, args.Pass()));
I think you can inline the args (and make_scoped_ptr makes it shorter).

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
File chrome/browser/extensions/api/rtc_private/rtc_private_api.cc (right):

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
chrome/browser/extensions/api/rtc_private/rtc_private_api.cc:95: kOnLaunchEvent,
scoped_ptr<ListValue>(new ListValue())));
make_scoped_ptr works here.

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
File chrome/browser/extensions/menu_manager_unittest.cc (right):

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
chrome/browser/extensions/menu_manager_unittest.cc:461:
DispatchEventToExtensionMock(extension_id,
This mock method doesn't make sense anymore; it should reflect the new
interface. Don't know if you want to postpone fixing that to a later CL.

[Matt Perry, 2012-12-05 22:53:52]

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/bookmarks/...
File chrome/browser/bookmarks/bookmark_extension_api.cc (right):

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/bookmarks/...
chrome/browser/bookmarks/bookmark_extension_api.cc:154:
scoped_ptr<extensions::Event> event(new extensions::Event(
On 2012/12/05 22:28:32, Yoyo Zhou wrote:
> You might be able to use make_scoped_ptr to inline event in those places where
> you don't need to add fields to it. I don't have a strong opinion on this
> though.

Ah, for some reason I thought make_scoped_ptr didn't exist. I changed this
callsite, but I don't have the energy to update anything else :).

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
File chrome/browser/extensions/api/api_resource_event_notifier.cc (left):

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
chrome/browser/extensions/api/api_resource_event_notifier.cc:46: void
ApiResourceEventNotifier::DispatchEvent(const std::string &extension,
On 2012/12/05 22:28:32, Yoyo Zhou wrote:
> Is this indicative of a bug?

No, just braindead naming.

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
File chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc (right):

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc:210:
scoped_ptr<extensions::Event> event(new extensions::Event(
On 2012/12/05 22:28:32, Yoyo Zhou wrote:
> this is in the extensions namespace.

Done.

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
File chrome/browser/extensions/api/omnibox/omnibox_api.cc (right):

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
chrome/browser/extensions/api/omnibox/omnibox_api.cc:50:
events::kOnInputStarted, args.Pass()));
On 2012/12/05 22:28:32, Yoyo Zhou wrote:
> I think you can inline the args (and make_scoped_ptr makes it shorter).

Done.

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
File chrome/browser/extensions/api/rtc_private/rtc_private_api.cc (right):

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
chrome/browser/extensions/api/rtc_private/rtc_private_api.cc:95: kOnLaunchEvent,
scoped_ptr<ListValue>(new ListValue())));
On 2012/12/05 22:28:32, Yoyo Zhou wrote:
> make_scoped_ptr works here.

Done.

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
File chrome/browser/extensions/menu_manager_unittest.cc (right):

https://codereview.chromium.org/11440004/diff/12001/chrome/browser/extensions...
chrome/browser/extensions/menu_manager_unittest.cc:461:
DispatchEventToExtensionMock(extension_id,
On 2012/12/05 22:28:32, Yoyo Zhou wrote:
> This mock method doesn't make sense anymore; it should reflect the new
> interface. Don't know if you want to postpone fixing that to a later CL.

If you look later in the file, it uses gmock to check that the method is called
with certain parameters. I don't know if it's possible to do that if you change
the mock to accept a single Event struct.

[Matt Perry, 2012-12-05 22:55:02]

+tommi: chrome/browser/speech OWNERS
+sky: chrome/browser/history and bookmarks OWNERS
+dmazzoni: accessibility OWNERS

This is a refactoring, so I don't expect you'll need to do a thorough review.

[tfarina, 2012-12-05 22:57:19]

https://codereview.chromium.org/11440004/diff/5054/chrome/browser/bookmarks/b...
File chrome/browser/bookmarks/bookmark_manager_extension_api.cc (right):

https://codereview.chromium.org/11440004/diff/5054/chrome/browser/bookmarks/b...
chrome/browser/bookmarks/bookmark_manager_extension_api.cc:182:
BroadcastEvent(event.Pass());
do you want to do the same you did in bookmark_extension_api.cc, and use
make_scoped_ptr here as well?

[commit-bot: I haz the power, 2012-12-05 22:58:28]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mpcomplete@chromium.org/11440004/5054

[tfarina, 2012-12-05 22:59:12]

https://codereview.chromium.org/11440004/diff/5054/chrome/browser/bookmarks/b...
File chrome/browser/bookmarks/bookmark_manager_extension_api.cc (right):

https://codereview.chromium.org/11440004/diff/5054/chrome/browser/bookmarks/b...
chrome/browser/bookmarks/bookmark_manager_extension_api.cc:176: if
(!extensions::ExtensionSystem::Get(profile_)->event_router())
you can also rewrite this function in the same manner of
BookmarkExtensionEventRouter::DispatchEvent and save some vertical lines. Not
strictly necessary though.

[dmazzoni, 2012-12-05 22:59:46]

lgtm for accessibility and speech

[commit-bot: I haz the power, 2012-12-06 00:18:28]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_chromeos.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-12-06 00:35:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mpcomplete@chromium.org/11440004/5054

[sky, 2012-12-06 01:49:19]

LGTM

[commit-bot: I haz the power, 2012-12-06 01:55:15]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_chromeos.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-12-06 02:32:51]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mpcomplete@chromium.org/11440004/5054

[commit-bot: I haz the power, 2012-12-06 03:43:25]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_chromeos.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[tommi (sloooow) - chröme, 2012-12-06 14:26:00]

lgtm for browser/speech.

https://codereview.chromium.org/11440004/diff/5054/chrome/browser/speech/spee...
File chrome/browser/speech/speech_input_extension_manager.cc (right):

https://codereview.chromium.org/11440004/diff/5054/chrome/browser/speech/spee...
chrome/browser/speech/speech_input_extension_manager.cc:456: const std::string&
extension_id, const std::string& event_name,
update the header as well?

[commit-bot: I haz the power, 2012-12-06 18:05:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mpcomplete@chromium.org/11440004/5054

[commit-bot: I haz the power, 2012-12-06 18:05:25]

Failed to apply patch for
chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
  Hunk #1 FAILED at 92.
  Hunk #2 FAILED at 111.
  2 out of 2 hunks FAILED -- saving rejects to file
chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc.rej

Patch:      
chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
Index:
chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
diff --git
a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
index
1cb4627fa9efbf32b4bb83dba0f966d3ec150728..9a6e4d61e8bc2b499c6fa805aeb3e9b44562e222
100644
---
a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
+++
b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
@@ -92,9 +92,11 @@ void ExtensionSyncEventObserver::OnSyncStateUpdated(
       api::sync_file_system::OnSyncStateChanged::Create(sync_state));
 
   // Dispatch the event to the extension
+  scoped_ptr<Event> event(new Event(
+      event_names::kOnSyncStateChanged, params.Pass()));
+  event->restrict_to_profile = profile_;
   ExtensionSystem::Get(profile_)->event_router()->DispatchEventToExtension(
-      extension_id, event_names::kOnSyncStateChanged, params.Pass(),
-      profile_, GURL());
+      extension_id, event.Pass());
 }
 
 void ExtensionSyncEventObserver::OnFileSynced(
@@ -111,9 +113,11 @@ void ExtensionSyncEventObserver::OnFileSynced(
                                                   sync_operation_type));
 
   // Dispatch the event to the extension
+  scoped_ptr<Event> event(new Event(
+      event_names::kOnFileSynced, params.Pass()));
+  event->restrict_to_profile = profile_;
   ExtensionSystem::Get(profile_)->event_router()->DispatchEventToExtension(
-      extension_id, event_names::kOnFileSynced, params.Pass(),
-      profile_, GURL());
+      extension_id, event.Pass());
 }
 
 }  // namespace extensions

[commit-bot: I haz the power, 2012-12-06 19:52:30]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mpcomplete@chromium.org/11440004/22001

[commit-bot: I haz the power, 2012-12-06 19:53:17]

Failed to apply patch for
chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc
  Hunk #1 FAILED at 281.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc.rej

Patch:       chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc
Index: chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc
diff --git a/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc
b/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc
index
90db58f23c0cde1517da34dfda51383ab9217f6a..12265c7a483644738c6f873876f4fe3fd730fe54
100644
--- a/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc
+++ b/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc
@@ -281,10 +281,11 @@ void OffscreenTab::Observe(int type,
   // The event router only dispatches the event to renderers listening for the
   // event.
   Profile* profile = parent_tab_->tab_contents()->profile();
+  scoped_ptr<extensions::Event> event(new extensions::Event(
+      events::kOnOffscreenTabUpdated, args.Pass()));
+  event->restrict_to_profile = profile;
   extensions::ExtensionSystem::Get(profile)->event_router()->
-      DispatchEventToRenderers(
-          events::kOnOffscreenTabUpdated, args.Pass(), profile, GURL(),
-          extensions::EventFilteringInfo());
+      BroadcastEvent(event.Pass());
 }
 
 ParentTab::ParentTab() : tab_contents_(NULL) {}

[commit-bot: I haz the power, 2012-12-06 20:06:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mpcomplete@chromium.org/11440004/29001

[commit-bot: I haz the power, 2012-12-06 20:44:48]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_chromeos.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-12-06 23:12:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mpcomplete@chromium.org/11440004/29001

[commit-bot: I haz the power, 2012-12-06 23:32:48]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_chromeos.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-12-07 00:38:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mpcomplete@chromium.org/11440004/29001

[commit-bot: I haz the power, 2012-12-07 00:45:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mpcomplete@chromium.org/11440004/36003

[commit-bot: I haz the power, 2012-12-07 07:48:06]

Change committed as 171719