Fix virtual/override/final usage in Source/modules/.

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"
@@ skipping 52 matching lines @@
             return self->bindToV8Function();
         }
 
     private:
         ScriptFunctionImpl(ScriptState* scriptState, StubScriptFunction& owner)
             : ScriptFunction(scriptState)
             , m_owner(owner)
         {
         }
 
-        virtual ScriptValue call(ScriptValue arg) override
+        ScriptValue call(ScriptValue arg) override
         {
             m_owner.m_arg = arg;
             m_owner.m_callCount++;
             return ScriptValue();
         }
 
         StubScriptFunction& m_owner;
     };
 };
 
@@ skipping 20 matching lines @@
 
 // Matches a ScriptValue and a DOMException with a specific name and message.
 class ExpectDOMException : public ScriptValueTest {
 public:
     ExpectDOMException(const String& expectedName, const String& expectedMessage)
         : m_expectedName(expectedName)
         , m_expectedMessage(expectedMessage)
     {
     }
 
-    virtual ~ExpectDOMException() override { }
+    ~ExpectDOMException() override { }
 
-    virtual void operator()(ScriptValue value) const override
+    void operator()(ScriptValue value) const override
     {
         DOMException* exception = V8DOMException::toImplWithTypeCheck(value.isolate(), value.v8Value());
         EXPECT_TRUE(exception) << "the value should be a DOMException";
         if (!exception)
             return;
         EXPECT_EQ(m_expectedName, exception->name());
         EXPECT_EQ(m_expectedMessage, exception->message());
     }
 
 private:
     String m_expectedName;
     String m_expectedMessage;
 };
 
 // Service Worker-specific tests.
 
 class NotReachedWebServiceWorkerProvider : public WebServiceWorkerProvider {
 public:
-    virtual ~NotReachedWebServiceWorkerProvider() override { }
+    ~NotReachedWebServiceWorkerProvider() override { }
 
-    virtual void registerServiceWorker(const WebURL& pattern, const WebURL& scriptURL, WebServiceWorkerRegistrationCallbacks* callbacks) override
+    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;
     }
 };
 
 class ServiceWorkerContainerTest : public ::testing::Test {
 protected:
     ServiceWorkerContainerTest()
         : m_page(DummyPageHolder::create())
@@ skipping 123 matching lines @@
     const WebURL& getRegistrationURL() { return m_getRegistrationURL; }
 
 private:
     class WebServiceWorkerProviderImpl : public WebServiceWorkerProvider {
     public:
         WebServiceWorkerProviderImpl(StubWebServiceWorkerProvider& owner)
             : m_owner(owner)
         {
         }
 
-        virtual ~WebServiceWorkerProviderImpl() override { }
+        ~WebServiceWorkerProviderImpl() override { }
 
-        virtual void registerServiceWorker(const WebURL& pattern, const WebURL& scriptURL, WebServiceWorkerRegistrationCallbacks* callbacks) override
+        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_registrationCallbacksToDelete.append(adoptPtr(callbacks));
         }
 
-        virtual void getRegistration(const WebURL& documentURL, WebServiceWorkerGetRegistrationCallbacks* callbacks) override
+        void getRegistration(const WebURL& documentURL, WebServiceWorkerGetRegistrationCallbacks* callbacks) override
         {
             m_owner.m_getRegistrationCallCount++;
             m_owner.m_getRegistrationURL = documentURL;
             m_getRegistrationCallbacksToDelete.append(adoptPtr(callbacks));
         }
 
     private:
         StubWebServiceWorkerProvider& m_owner;
         Vector<OwnPtr<WebServiceWorkerRegistrationCallbacks>> m_registrationCallbacksToDelete;
         Vector<OwnPtr<WebServiceWorkerGetRegistrationCallbacks>> m_getRegistrationCallbacksToDelete;
@@ skipping 45 matching lines @@
         container->getRegistration(scriptState(), "");
         EXPECT_EQ(1ul, stubProvider.getRegistrationCallCount());
         EXPECT_EQ(WebURL(KURL(KURL(), "http://localhost/x/index.html")), stubProvider.getRegistrationURL());
     }
 
     container->willBeDetachedFromFrame();
 }
 
 } // namespace
 } // namespace blink