ServiceWorker: Change the return value of ServiceWorkerRegistration::unregister to boolean (3/4)

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 "config.h"
 #include "modules/serviceworkers/ServiceWorkerContainer.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
@@ skipping 113 matching lines @@
 class NotReachedWebServiceWorkerProvider : public WebServiceWorkerProvider {
 public:
     virtual ~NotReachedWebServiceWorkerProvider() OVERRIDE { }
 
     virtual void registerServiceWorker(const WebURL& pattern, const WebURL& scriptURL, WebServiceWorkerRegistrationCallbacks* callbacks) OVERRIDE
     {
         ADD_FAILURE() << "the provider should not be called to register a Service Worker";
         delete callbacks;
     }
 
-    virtual void unregisterServiceWorker(const WebURL& pattern, WebServiceWorkerRegistrationCallbacks* callbacks) OVERRIDE
+    virtual void unregisterServiceWorker(const WebURL& pattern, WebServiceWorkerUnregistrationCallbacks* callbacks) OVERRIDE
     {
         ADD_FAILURE() << "the provider should not be called to unregister a Service Worker";
         delete callbacks;
     }
 };
 
 class ServiceWorkerContainerTest : public ::testing::Test {
 protected:
     ServiceWorkerContainerTest()
         : m_page(DummyPageHolder::create())
@@ skipping 132 matching lines @@
         {
         }
 
         virtual ~WebServiceWorkerProviderImpl() OVERRIDE { }
 
         virtual void registerServiceWorker(const WebURL& pattern, const WebURL& scriptURL, WebServiceWorkerRegistrationCallbacks* callbacks) OVERRIDE
         {
             m_owner.m_registerCallCount++;
             m_owner.m_registerScope = pattern;
             m_owner.m_registerScriptURL = scriptURL;
-            m_callbacksToDelete.append(adoptPtr(callbacks));
+            m_registrationCallbacksToDelete.append(adoptPtr(callbacks));
         }
 
-        virtual void unregisterServiceWorker(const WebURL& pattern, WebServiceWorkerRegistrationCallbacks* callbacks) OVERRIDE
+        virtual void unregisterServiceWorker(const WebURL& pattern, WebServiceWorkerUnregistrationCallbacks* callbacks) OVERRIDE
         {
             m_owner.m_unregisterCallCount++;
             m_owner.m_unregisterScope = pattern;
-            m_callbacksToDelete.append(adoptPtr(callbacks));
+            m_unregistrationCallbacksToDelete.append(adoptPtr(callbacks));
         }
 
     private:
         StubWebServiceWorkerProvider& m_owner;
-        Vector<OwnPtr<WebServiceWorkerRegistrationCallbacks> > m_callbacksToDelete;
+        Vector<OwnPtr<WebServiceWorkerRegistrationCallbacks> > m_registrationCallbacksToDelete;
+        Vector<OwnPtr<WebServiceWorkerUnregistrationCallbacks> > m_unregistrationCallbacksToDelete;
     };
 
 private:
     size_t m_registerCallCount;
     WebURL m_registerScope;
     WebURL m_registerScriptURL;
     size_t m_unregisterCallCount;
     WebURL m_unregisterScope;
 };
 
@@ skipping 25 matching lines @@
 
         EXPECT_EQ(1ul, stubProvider.unregisterCallCount());
         EXPECT_EQ(WebURL(KURL(KURL(), "http://localhost/x/y/")), stubProvider.unregisterScope());
     }
 
     container->willBeDetachedFromFrame();
 }
 
 } // namespace
 } // namespace blink