Dispatch the ServiceWorker "activate" event during activation

Source/modules/serviceworkers/WaitUntilObserver.h

Index: Source/modules/serviceworkers/WaitUntilObserver.h
diff --git a/Source/modules/serviceworkers/WaitUntilObserver.h b/Source/modules/serviceworkers/WaitUntilObserver.h
index f20836445d07823c062640e9306bc812208aea4f..e0c4e7462da2c9c0cc8f9028b931138e21d677b7 100644
--- a/Source/modules/serviceworkers/WaitUntilObserver.h
+++ b/Source/modules/serviceworkers/WaitUntilObserver.h
@@ -20,7 +20,12 @@ class WaitUntilObserver FINAL :
     public ContextLifecycleObserver,
     public RefCounted<WaitUntilObserver> {
 public:
-    static PassRefPtr<WaitUntilObserver> create(ExecutionContext*, int eventID);
+    enum EventType {
+        Activate,
+        Install
+    };
+
+    static PassRefPtr<WaitUntilObserver> create(ExecutionContext*, EventType, int eventID);
 
     ~WaitUntilObserver();
 
@@ -28,20 +33,21 @@ public:
     void willDispatchEvent();
     void didDispatchEvent();
 
-    // Observes the promise and delays calling didHandleInstallEvent() until
+    // Observes the promise and delays calling the continuation until
     // the given promise is resolved or rejected.
     void waitUntil(const ScriptValue&);
 
 private:
     class ThenFunction;
 
-    WaitUntilObserver(ExecutionContext*, int eventID);
+    WaitUntilObserver(ExecutionContext*, EventType, int eventID);
 
     void reportError(const ScriptValue&);
 
     void incrementPendingActivity();
     void decrementPendingActivity();
 
+    EventType m_type;
     int m_eventID;
     int m_pendingActivity;
     bool m_hasError;