Replace FINAL and OVERRIDE with their C++11 counterparts in Source/modules/serviceworkers

Source/modules/serviceworkers/CacheTest.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/Cache.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
@@ skipping 35 matching lines @@
         m_lastErrorWebCacheMethodCalled.clear();
         return old;
     }
 
     // These methods do not take ownership of their parameter. They provide an optional sample object to check parameters against.
     void setExpectedUrl(const String* expectedUrl) { m_expectedUrl = expectedUrl; }
     void setExpectedQueryParams(const QueryParams* expectedQueryParams) { m_expectedQueryParams = expectedQueryParams; }
     void setExpectedBatchOperations(const WebVector<BatchOperation>* expectedBatchOperations) { m_expectedBatchOperations = expectedBatchOperations; }
 
     // From WebServiceWorkerCache:
-    virtual void dispatchMatch(CacheMatchCallbacks* callbacks, const WebServiceWorkerRequest& webRequest, const QueryParams& queryParams) OVERRIDE
+    virtual void dispatchMatch(CacheMatchCallbacks* callbacks, const WebServiceWorkerRequest& webRequest, const QueryParams& queryParams) override
     {
         m_lastErrorWebCacheMethodCalled = "dispatchMatch";
         checkUrlIfProvided(webRequest.url());
         checkQueryParamsIfProvided(queryParams);
 
         OwnPtr<CacheMatchCallbacks> ownedCallbacks(adoptPtr(callbacks));
         WebServiceWorkerCacheError error = m_error;
         return callbacks->onError(&error);
     }
 
-    virtual void dispatchMatchAll(CacheWithResponsesCallbacks* callbacks, const WebServiceWorkerRequest& webRequest, const QueryParams& queryParams) OVERRIDE
+    virtual void dispatchMatchAll(CacheWithResponsesCallbacks* callbacks, const WebServiceWorkerRequest& webRequest, const QueryParams& queryParams) override
     {
         m_lastErrorWebCacheMethodCalled = "dispatchMatchAll";
         checkUrlIfProvided(webRequest.url());
         checkQueryParamsIfProvided(queryParams);
 
         OwnPtr<CacheWithResponsesCallbacks> ownedCallbacks(adoptPtr(callbacks));
         WebServiceWorkerCacheError error = m_error;
         return callbacks->onError(&error);
     }
 
-    virtual void dispatchKeys(CacheWithRequestsCallbacks* callbacks, const WebServiceWorkerRequest* webRequest, const QueryParams& queryParams) OVERRIDE
+    virtual void dispatchKeys(CacheWithRequestsCallbacks* callbacks, const WebServiceWorkerRequest* webRequest, const QueryParams& queryParams) override
     {
         m_lastErrorWebCacheMethodCalled = "dispatchKeys";
         if (webRequest) {
             checkUrlIfProvided(webRequest->url());
             checkQueryParamsIfProvided(queryParams);
         }
 
         OwnPtr<CacheWithRequestsCallbacks> ownedCallbacks(adoptPtr(callbacks));
         WebServiceWorkerCacheError error = m_error;
         return callbacks->onError(&error);
     }
 
-    virtual void dispatchBatch(CacheWithResponsesCallbacks* callbacks, const WebVector<BatchOperation>& batchOperations) OVERRIDE
+    virtual void dispatchBatch(CacheWithResponsesCallbacks* callbacks, const WebVector<BatchOperation>& batchOperations) override
     {
         m_lastErrorWebCacheMethodCalled = "dispatchBatch";
         checkBatchOperationsIfProvided(batchOperations);
 
         OwnPtr<CacheWithResponsesCallbacks> ownedCallbacks(adoptPtr(callbacks));
         WebServiceWorkerCacheError error = m_error;
         return callbacks->onError(&error);
     }
 
 protected:
@@ skipping 100 matching lines @@
 private:
     // A ScriptFunction that creates a test failure if it is ever called.
     class UnreachableFunction : public ScriptFunction {
     public:
         static v8::Handle<v8::Function> create(ScriptState* scriptState)
         {
             UnreachableFunction* self = new UnreachableFunction(scriptState);
             return self->bindToV8Function();
         }
 
-        virtual ScriptValue call(ScriptValue value) OVERRIDE
+        virtual ScriptValue call(ScriptValue value) override
         {
             ADD_FAILURE() << "Unexpected call to a null ScriptFunction.";
             return value;
         }
     private:
         UnreachableFunction(ScriptState* scriptState) : ScriptFunction(scriptState) { }
     };
 
     // A ScriptFunction that saves its parameter; used by tests to assert on correct
     // values being passed.
     class TestFunction : public ScriptFunction {
     public:
         static v8::Handle<v8::Function> create(ScriptState* scriptState, ScriptValue* outValue)
         {
             TestFunction* self = new TestFunction(scriptState, outValue);
             return self->bindToV8Function();
         }
 
-        virtual ScriptValue call(ScriptValue value) OVERRIDE
+        virtual ScriptValue call(ScriptValue value) override
         {
             ASSERT(!value.isEmpty());
             *m_value = value;
             return value;
         }
 
     private:
         TestFunction(ScriptState* scriptState, ScriptValue* outValue) : ScriptFunction(scriptState), m_value(outValue) { }
 
         ScriptValue* m_value;
     };
 
     // From ::testing::Test:
-    virtual void SetUp() OVERRIDE
+    virtual void SetUp() override
     {
         EXPECT_FALSE(m_scriptScope);
         m_scriptScope = adoptPtr(new ScriptState::Scope(scriptState()));
     }
 
-    virtual void TearDown() OVERRIDE
+    virtual void TearDown() override
     {
         m_scriptScope = 0;
     }
 
     // Lifetime is that of the text fixture.
     OwnPtr<DummyPageHolder> m_page;
 
     // Lifetime is per test instance.
     OwnPtr<ScriptState::Scope> m_scriptScope;
 };
@@ skipping 138 matching lines @@
 
     // FIXME: test add & addAll.
 }
 
 class MatchTestCache : public NotImplementedErrorCache {
 public:
     MatchTestCache(WebServiceWorkerResponse& response)
         : m_response(response) { }
 
     // From WebServiceWorkerCache:
-    virtual void dispatchMatch(CacheMatchCallbacks* callbacks, const WebServiceWorkerRequest& webRequest, const QueryParams& queryParams) OVERRIDE
+    virtual void dispatchMatch(CacheMatchCallbacks* callbacks, const WebServiceWorkerRequest& webRequest, const QueryParams& queryParams) override
     {
         OwnPtr<CacheMatchCallbacks> ownedCallbacks(adoptPtr(callbacks));
         return callbacks->onSuccess(&m_response);
     }
 
 private:
     WebServiceWorkerResponse& m_response;
 };
 
 TEST_F(ServiceWorkerCacheTest, MatchResponseTest)
@@ skipping 13 matching lines @@
     Response* response = V8Response::toImplWithTypeCheck(isolate(), scriptValue.v8Value());
     ASSERT_TRUE(response);
     EXPECT_EQ(responseUrl, response->url());
 }
 
 class KeysTestCache : public NotImplementedErrorCache {
 public:
     KeysTestCache(WebVector<WebServiceWorkerRequest>& requests)
         : m_requests(requests) { }
 
-    virtual void dispatchKeys(CacheWithRequestsCallbacks* callbacks, const WebServiceWorkerRequest* webRequest, const QueryParams& queryParams) OVERRIDE
+    virtual void dispatchKeys(CacheWithRequestsCallbacks* callbacks, const WebServiceWorkerRequest* webRequest, const QueryParams& queryParams) override
     {
         OwnPtr<CacheWithRequestsCallbacks> ownedCallbacks(adoptPtr(callbacks));
         return callbacks->onSuccess(&m_requests);
     }
 
 private:
     WebVector<WebServiceWorkerRequest>& m_requests;
 };
 
 TEST_F(ServiceWorkerCacheTest, KeysResponseTest)
@@ skipping 23 matching lines @@
         if (request)
             EXPECT_EQ(expectedUrls[i], request->url());
     }
 }
 
 class MatchAllAndBatchTestCache : public NotImplementedErrorCache {
 public:
     MatchAllAndBatchTestCache(WebVector<WebServiceWorkerResponse>& responses)
         : m_responses(responses) { }
 
-    virtual void dispatchMatchAll(CacheWithResponsesCallbacks* callbacks, const WebServiceWorkerRequest& webRequest, const QueryParams& queryParams) OVERRIDE
+    virtual void dispatchMatchAll(CacheWithResponsesCallbacks* callbacks, const WebServiceWorkerRequest& webRequest, const QueryParams& queryParams) override
     {
         OwnPtr<CacheWithResponsesCallbacks> ownedCallbacks(adoptPtr(callbacks));
         return callbacks->onSuccess(&m_responses);
     }
 
-    virtual void dispatchBatch(CacheWithResponsesCallbacks* callbacks, const WebVector<BatchOperation>& batchOperations) OVERRIDE
+    virtual void dispatchBatch(CacheWithResponsesCallbacks* callbacks, const WebVector<BatchOperation>& batchOperations) override
     {
         OwnPtr<CacheWithResponsesCallbacks> ownedCallbacks(adoptPtr(callbacks));
         return callbacks->onSuccess(&m_responses);
     }
 
 private:
     WebVector<WebServiceWorkerResponse>& m_responses;
 };
 
 TEST_F(ServiceWorkerCacheTest, MatchAllAndBatchResponseTest)
@@ skipping 28 matching lines @@
     }
 
     result = cache->deleteFunction(scriptState(), "http://some.url/", *options);
     scriptValue = getResolveValue(result);
     EXPECT_TRUE(scriptValue.v8Value()->IsBoolean());
     EXPECT_EQ(true, scriptValue.v8Value()->BooleanValue());
 }
 
 } // namespace
 } // namespace blink