Replace OVERRIDE and FINAL with override and final in WebKit/public

Source/web/tests/WebViewTest.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 173 matching lines @@
     {
         return m_chooserCompletion;
     }
 
     void clearChooserCompletion()
     {
         m_chooserCompletion = 0;
     }
 
     // WebViewClient methods
-    virtual bool openDateTimeChooser(const WebDateTimeChooserParams&, WebDateTimeChooserCompletion* chooser_completion) OVERRIDE
+    virtual bool openDateTimeChooser(const WebDateTimeChooserParams&, WebDateTimeChooserCompletion* chooser_completion) override
     {
         m_chooserCompletion = chooser_completion;
         return true;
     }
 
 private:
     WebDateTimeChooserCompletion* m_chooserCompletion;
 
 };
 
@@ skipping 755 matching lines @@
 }
 
 class PrintWebViewClient : public FrameTestHelpers::TestWebViewClient {
 public:
     PrintWebViewClient()
         : m_printCalled(false)
     {
     }
 
     // WebViewClient methods
-    virtual void printPage(WebLocalFrame*) OVERRIDE
+    virtual void printPage(WebLocalFrame*) override
     {
         m_printCalled = true;
     }
 
     bool printCalled() const { return m_printCalled; }
 
 private:
     bool m_printCalled;
 };
 
 
 TEST_F(WebViewTest, PrintWithXHRInFlight)
 {
     PrintWebViewClient client;
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("print_with_xhr_inflight.html"));
     WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(m_baseURL + "print_with_xhr_inflight.html", true, 0, &client);
 
     ASSERT_EQ(FrameStateComplete, toLocalFrame(webViewImpl->page()->mainFrame())->loader().state());
     EXPECT_TRUE(client.printCalled());
     m_webViewHelper.reset();
 }
 
 class DropTask : public WebThread::Task {
 public:
     explicit DropTask(WebView* webView) : m_webView(webView)
     {
     }
 
-    virtual void run() OVERRIDE
+    virtual void run() override
     {
         const WebPoint clientPoint(0, 0);
         const WebPoint screenPoint(0, 0);
         m_webView->dragTargetDrop(clientPoint, screenPoint, 0);
     }
 
 private:
     WebView* const m_webView;
 };
 static void DragAndDropURL(WebViewImpl* webView, const std::string& url)
@@ skipping 39 matching lines @@
 
     // Attempt to drag and drop to barUrl and verify that no navigation has occurred.
     DragAndDropURL(webView, barUrl);
     EXPECT_EQ(fooUrl, webView->mainFrame()->document().url().string().utf8());
 }
 
 class ContentDetectorClient : public FrameTestHelpers::TestWebViewClient {
 public:
     ContentDetectorClient() { reset(); }
 
-    virtual WebContentDetectionResult detectContentAround(const WebHitTestResult& hitTest) OVERRIDE
+    virtual WebContentDetectionResult detectContentAround(const WebHitTestResult& hitTest) override
     {
         m_contentDetectionRequested = true;
         return m_contentDetectionResult;
     }
 
-    virtual void scheduleContentIntent(const WebURL& url) OVERRIDE
+    virtual void scheduleContentIntent(const WebURL& url) override
     {
         m_scheduledIntentURL = url;
     }
 
-    virtual void cancelScheduledContentIntents() OVERRIDE
+    virtual void cancelScheduledContentIntents() override
     {
         m_pendingIntentsCancelled = true;
     }
 
     void reset()
     {
         m_contentDetectionRequested = false;
         m_pendingIntentsCancelled = false;
         m_scheduledIntentURL = WebURL();
         m_contentDetectionResult = WebContentDetectionResult();
@@ skipping 222 matching lines @@
 class MockAutofillClient : public WebAutofillClient {
 public:
     MockAutofillClient()
         : m_ignoreTextChanges(false)
         , m_textChangesWhileIgnored(0)
         , m_textChangesWhileNotIgnored(0)
         , m_userGestureNotificationsCount(0) { }
 
     virtual ~MockAutofillClient() { }
 
-    virtual void setIgnoreTextChanges(bool ignore) OVERRIDE { m_ignoreTextChanges = ignore; }
-    virtual void textFieldDidChange(const WebFormControlElement&) OVERRIDE
+    virtual void setIgnoreTextChanges(bool ignore) override { m_ignoreTextChanges = ignore; }
+    virtual void textFieldDidChange(const WebFormControlElement&) override
     {
         if (m_ignoreTextChanges)
             ++m_textChangesWhileIgnored;
         else
             ++m_textChangesWhileNotIgnored;
     }
-    virtual void firstUserGestureObserved() OVERRIDE { ++m_userGestureNotificationsCount; }
+    virtual void firstUserGestureObserved() override { ++m_userGestureNotificationsCount; }
 
     void clearChangeCounts()
     {
         m_textChangesWhileIgnored = 0;
         m_textChangesWhileNotIgnored = 0;
     }
 
     int textChangesWhileIgnored() { return m_textChangesWhileIgnored; }
     int textChangesWhileNotIgnored() { return m_textChangesWhileNotIgnored; }
     int getUserGestureNotificationsCount() { return m_userGestureNotificationsCount; }
@@ skipping 112 matching lines @@
 }
 
 class ViewCreatingWebViewClient : public FrameTestHelpers::TestWebViewClient {
 public:
     ViewCreatingWebViewClient()
         : m_didFocusCalled(false)
     {
     }
 
     // WebViewClient methods
-    virtual WebView* createView(WebLocalFrame*, const WebURLRequest&, const WebWindowFeatures&, const WebString& name, WebNavigationPolicy, bool) OVERRIDE
+    virtual WebView* createView(WebLocalFrame*, const WebURLRequest&, const WebWindowFeatures&, const WebString& name, WebNavigationPolicy, bool) override
     {
         return m_webViewHelper.initialize(true, 0, 0);
     }
 
     // WebWidgetClient methods
-    virtual void didFocus() OVERRIDE
+    virtual void didFocus() override
     {
         m_didFocusCalled = true;
     }
 
     bool didFocusCalled() const { return m_didFocusCalled; }
     WebView* createdWebView() const { return m_webViewHelper.webView(); }
 
 private:
     FrameTestHelpers::WebViewHelper m_webViewHelper;
     bool m_didFocusCalled;
@@ skipping 200 matching lines @@
     webView->layout();
     WebRect cropRect(0, 0, 100, 100);
     webView->extractSmartClipData(cropRect, clipText, clipHtml, clipRect);
     EXPECT_STREQ("", clipText.utf8().c_str());
     EXPECT_STREQ("", clipHtml.utf8().c_str());
 }
 
 class CreateChildCounterFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
     CreateChildCounterFrameClient() : m_count(0) { }
-    virtual WebFrame* createChildFrame(WebLocalFrame* parent, const WebString& frameName) OVERRIDE;
+    virtual WebFrame* createChildFrame(WebLocalFrame* parent, const WebString& frameName) override;
 
     int count() const { return m_count; }
 
 private:
     int m_count;
 };
 
 WebFrame* CreateChildCounterFrameClient::createChildFrame(WebLocalFrame* parent, const WebString& frameName)
 {
     ++m_count;
@@ skipping 36 matching lines @@
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("add_frame_in_unload.html"));
     m_webViewHelper.initializeAndLoad(m_baseURL + "add_frame_in_unload_wrapper.html", true, &frameClient);
     FrameTestHelpers::loadFrame(m_webViewHelper.webView()->mainFrame(), "about:blank");
     EXPECT_EQ(1, frameClient.count());
     m_webViewHelper.reset();
 }
 
 class TouchEventHandlerWebViewClient : public FrameTestHelpers::TestWebViewClient {
 public:
     // WebWidgetClient methods
-    virtual void hasTouchEventHandlers(bool state) OVERRIDE
+    virtual void hasTouchEventHandlers(bool state) override
     {
         m_hasTouchEventHandlerCount[state]++;
     }
 
     // Local methods
     TouchEventHandlerWebViewClient() : m_hasTouchEventHandlerCount()
     {
     }
 
     int getAndResetHasTouchEventHandlerCallCount(bool state)
@@ skipping 270 matching lines @@
     WebRect actualRootBounds;
     webView->getSelectionRootBounds(actualRootBounds);
     ASSERT_EQ(expectedRootBounds, actualRootBounds);
 }
 
 class NonUserInputTextUpdateWebViewClient : public FrameTestHelpers::TestWebViewClient {
 public:
     NonUserInputTextUpdateWebViewClient() : m_textIsUpdated(false) { }
 
     // WebWidgetClient methods
-    virtual void didUpdateTextOfFocusedElementByNonUserInput() OVERRIDE
+    virtual void didUpdateTextOfFocusedElementByNonUserInput() override
     {
         m_textIsUpdated = true;
     }
 
     void reset()
     {
         m_textIsUpdated = false;
     }
 
     bool textIsUpdated() const
@@ skipping 176 matching lines @@
     loadFrame(webView->mainFrame(), url);
 
     FrameView* frameView = m_webViewHelper.webViewImpl()->mainFrameImpl()->frameView();
 
     // Auto-resizing used to ASSERT(needsLayout()) in RenderBlockFlow::layout. This EXPECT is
     // merely a dummy. The real test is that we don't trigger asserts in debug builds.
     EXPECT_FALSE(frameView->needsLayout());
 };
 
 } // namespace