[extension SW] Support lazy events from extension service workers.

extensions/browser/event_listener_map.h

 // Copyright 2013 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_LISTENER_MAP_H_
 #define EXTENSIONS_BROWSER_EVENT_LISTENER_MAP_H_
 
 #include <map>
 #include <memory>
 #include <set>
@@ skipping 49 matching lines @@
       content::RenderProcessHost* process,
       std::unique_ptr<base::DictionaryValue> filter);
   // Constructs EventListener for an Extension service worker.
   // Similar to ForExtension above with the only difference that
   // |worker_thread_id_| contains a valid worker thread, as opposed to
   // kNonWorkerThreadId.
   static std::unique_ptr<EventListener> ForExtensionServiceWorker(
       const std::string& event_name,
       const std::string& extension_id,
       content::RenderProcessHost* process,
+      const GURL& service_worker_scope,
       int worker_thread_id,
       std::unique_ptr<base::DictionaryValue> filter);
 
   ~EventListener();
 
   bool Equals(const EventListener* other) const;
 
   std::unique_ptr<EventListener> Copy() const;
 
   // Returns true if the listener is for a lazy context: e.g. a background page
   // or an extension service worker. This listener does not have |process_|.
   bool IsLazy() const;
 
   // Returns true if this listener was registered for an extension service
   // worker.
   bool IsForServiceWorker() const;

[Devlin, 2017/06/16 02:34:42]

We probably shouldn't have two "IsForServiceWorker" methods. :)

[lazyboy, 2017/06/16 18:48:05]

Aha, I kept the new one close to the one so I don't forget, and still I forgot.

Done.

+  bool is_for_service_worker() const { return is_for_service_worker_; }
 
   // Modifies this listener to be a lazy listener, clearing process references.
   void MakeLazy();
 
   // Returns the browser context associated with the listener, or NULL if
   // IsLazy.
   content::BrowserContext* GetBrowserContext() const;
 
   const std::string& event_name() const { return event_name_; }
   const std::string& extension_id() const { return extension_id_; }
   const GURL& listener_url() const { return listener_url_; }
   content::RenderProcessHost* process() const { return process_; }
   base::DictionaryValue* filter() const { return filter_.get(); }
   EventFilter::MatcherID matcher_id() const { return matcher_id_; }
   void set_matcher_id(EventFilter::MatcherID id) { matcher_id_ = id; }
   int worker_thread_id() const { return worker_thread_id_; }
 
  private:
   EventListener(const std::string& event_name,
                 const std::string& extension_id,
                 const GURL& listener_url,
                 content::RenderProcessHost* process,
+                bool is_for_service_worker,
                 int worker_thread_id,
                 std::unique_ptr<base::DictionaryValue> filter);
 
   const std::string event_name_;
   const std::string extension_id_;
   const GURL listener_url_;
   content::RenderProcessHost* process_;
+  const bool is_for_service_worker_ = false;

[Devlin, 2017/06/16 02:34:42]

Do we need this + worker_thread_id?  If so, worth documenting why?

[lazyboy, 2017/06/16 18:48:05]

Yes we need both.
is_for_service_worker implies the listener (lazy or not) is for a SW.
worker_thread_id_ != kNonWorkerThreadId implies the listener is not a lazy SW
listener, i.e. a listener from a running worker. We use this info do dispatch
the event.

   const int worker_thread_id_;
   std::unique_ptr<base::DictionaryValue> filter_;
   EventFilter::MatcherID matcher_id_;  // -1 if unset.
 
   DISALLOW_COPY_AND_ASSIGN(EventListener);
 };
 
 // Holds listeners for extension events and can answer questions about which
 // listeners are interested in what events.
 class EventListenerMap {
@@ skipping 85 matching lines @@
   std::map<EventFilter::MatcherID, EventListener*> listeners_by_matcher_id_;
 
   EventFilter event_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(EventListenerMap);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_EVENT_LISTENER_MAP_H_