ServiceWorkerContainer should override contextDestroyed and clear m_provider

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerTest.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 "modules/serviceworkers/ServiceWorkerContainer.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
@@ skipping 170 matching lines @@
         // When the registration is rejected, a register call must not reach
         // the provider.
         provide(wrapUnique(new NotReachedWebServiceWorkerProvider()));
 
         ServiceWorkerContainer* container = ServiceWorkerContainer::create(getExecutionContext());
         ScriptState::Scope scriptScope(getScriptState());
         RegistrationOptions options;
         options.setScope(scope);
         ScriptPromise promise = container->registerServiceWorker(getScriptState(), scriptURL, options);
         expectRejected(getScriptState(), promise, valueTest);
-
-        container->willBeDetachedFromFrame();

[haraken, 2016/07/14 09:03:53]

This is no longer needed because contextDestroyed() is called when the
DummyPageHolder is destructed at the end of the test.

     }
 
     void testGetRegistrationRejected(const String& documentURL, const ScriptValueTest& valueTest)
     {
         provide(wrapUnique(new NotReachedWebServiceWorkerProvider()));
 
         ServiceWorkerContainer* container = ServiceWorkerContainer::create(getExecutionContext());
         ScriptState::Scope scriptScope(getScriptState());
         ScriptPromise promise = container->getRegistration(getScriptState(), documentURL);
         expectRejected(getScriptState(), promise, valueTest);
-
-        container->willBeDetachedFromFrame();
     }
 
 private:
     std::unique_ptr<DummyPageHolder> m_page;
 };
 
 TEST_F(ServiceWorkerContainerTest, Register_NonSecureOriginIsRejected)
 {
     setPageURL("http://www.example.com/");
     testRegisterRejected(
@@ skipping 116 matching lines @@
     {
         ScriptState::Scope scriptScope(getScriptState());
         RegistrationOptions options;
         options.setScope("y/");
         container->registerServiceWorker(getScriptState(), "/x/y/worker.js", options);
 
         EXPECT_EQ(1ul, stubProvider.registerCallCount());
         EXPECT_EQ(WebURL(KURL(KURL(), "http://localhost/x/y/")), stubProvider.registerScope());
         EXPECT_EQ(WebURL(KURL(KURL(), "http://localhost/x/y/worker.js")), stubProvider.registerScriptURL());
     }
-
-    container->willBeDetachedFromFrame();
 }
 
 TEST_F(ServiceWorkerContainerTest, GetRegistration_OmittedDocumentURLDefaultsToPageURL)
 {
     setPageURL("http://localhost/x/index.html");
 
     StubWebServiceWorkerProvider stubProvider;
     provide(stubProvider.provider());
 
     ServiceWorkerContainer* container = ServiceWorkerContainer::create(getExecutionContext());
 
     {
         ScriptState::Scope scriptScope(getScriptState());
         container->getRegistration(getScriptState(), "");
         EXPECT_EQ(1ul, stubProvider.getRegistrationCallCount());
         EXPECT_EQ(WebURL(KURL(KURL(), "http://localhost/x/index.html")), stubProvider.getRegistrationURL());
     }
-
-    container->willBeDetachedFromFrame();
 }
 
 } // namespace
 } // namespace blink