Use the Navigator's frame in navigator.serviceWorker and associated container.

Source/modules/serviceworkers/NavigatorServiceWorker.cpp

 // Copyright 2014 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.
 
 #include "config.h"
 #include "modules/serviceworkers/NavigatorServiceWorker.h"
 
+#include "core/frame/DOMWindow.h"
+#include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
 #include "modules/serviceworkers/ServiceWorkerContainer.h"
 
 namespace WebCore {
 
 NavigatorServiceWorker::NavigatorServiceWorker(Navigator& navigator)
     : DOMWindowProperty(navigator.frame())
 {
 }
 
@@ skipping 14 matching lines @@
 NavigatorServiceWorker* NavigatorServiceWorker::toNavigatorServiceWorker(Navigator& navigator)
 {
     return static_cast<NavigatorServiceWorker*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName()));
 }
 
 const char* NavigatorServiceWorker::supplementName()
 {
     return "NavigatorServiceWorker";
 }
 
-ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(ExecutionContext* executionContext, Navigator& navigator)
+ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(Navigator& navigator)
 {
-    return NavigatorServiceWorker::from(navigator).serviceWorker(executionContext);
+    return NavigatorServiceWorker::from(navigator).serviceWorker();
 }
 
-ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(ExecutionContext* executionContext)
+ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker()
 {
-    if (!m_serviceWorker && frame())
-        m_serviceWorker = ServiceWorkerContainer::create(executionContext);
+    if (!m_serviceWorker && frame()) {
+        ASSERT(frame()->domWindow());
+        m_serviceWorker = ServiceWorkerContainer::create(frame()->domWindow()->executionContext());
+    }
     return m_serviceWorker.get();
 }
 
 void NavigatorServiceWorker::willDetachGlobalObjectFromFrame()
 {
     if (m_serviceWorker) {
         m_serviceWorker->detachClient();
         m_serviceWorker = nullptr;
     }
 }
 
 } // namespace WebCore