Move lazy event dispatching code out of EventRouter.

extensions/browser/event_router.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef EXTENSIONS_BROWSER_EVENT_ROUTER_H_
 #define EXTENSIONS_BROWSER_EVENT_ROUTER_H_
 
 #include <set>
 #include <string>
 #include <unordered_map>
@@ skipping 84 matching lines @@
   // methods BroadcastEvent or DispatchEventToExtension.
   static void DispatchEventToSender(IPC::Sender* ipc_sender,
                                     void* browser_context_id,
                                     const std::string& extension_id,
                                     events::HistogramValue histogram_value,
                                     const std::string& event_name,
                                     std::unique_ptr<base::ListValue> event_args,
                                     UserGestureState user_gesture,
                                     const EventFilteringInfo& info);
 
+  // Returns false when the event is scoped to a context and the listening
+  // extension does not have access to events from that context. Also fills
+  // |event_args| with the proper arguments to send, which may differ if

[Devlin, 2017/06/15 01:37:26]

I realize this was copy-paste, but event_args don't exist anymore.  Can we
update the comment?

[lazyboy, 2017/06/15 04:39:22]

Done.

+  // the event crosses the incognito boundary.
+  static bool CanDispatchEventToBrowserContext(content::BrowserContext* context,
+                                               const Extension* extension,
+                                               const Event& event);
+
   // An EventRouter is shared between |browser_context| and its associated
   // incognito context. |extension_prefs| may be NULL in tests.
   EventRouter(content::BrowserContext* browser_context,
               ExtensionPrefs* extension_prefs);
   ~EventRouter() override;
 
   // Add or remove an extension as an event listener for |event_name|.
   //
   // Note that multiple extensions can share a process due to process
   // collapsing. Also, a single extension can have 2 processes if it is a split
@@ skipping 177 matching lines @@
   // Dispatches the event to the specified extension or URL running in
   // |process|.
   void DispatchEventToProcess(const std::string& extension_id,
                               const GURL& listener_url,
                               content::RenderProcessHost* process,
                               int worker_thread_id,
                               const linked_ptr<Event>& event,
                               const base::DictionaryValue* listener_filter,
                               bool did_enqueue);
 
-  // Returns false when the event is scoped to a context and the listening
-  // extension does not have access to events from that context. Also fills
-  // |event_args| with the proper arguments to send, which may differ if
-  // the event crosses the incognito boundary.
-  bool CanDispatchEventToBrowserContext(content::BrowserContext* context,
-                                        const Extension* extension,
-                                        const linked_ptr<Event>& event);
-
   // Possibly loads given extension's background page in preparation to
   // dispatch an event.  Returns true if the event was queued for subsequent
   // dispatch, false otherwise.
   bool MaybeLoadLazyBackgroundPageToDispatchEvent(
       content::BrowserContext* context,
       const Extension* extension,
       const linked_ptr<Event>& event,
       const base::DictionaryValue* listener_filter);
 
   // Adds a filter to an event.
@@ skipping 145 matching lines @@
   const std::string event_name;
 
   const std::string extension_id;
   const GURL listener_url;
   content::BrowserContext* const browser_context;
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_EVENT_ROUTER_H_