Remove support for legacy WebKit Notifications

Source/web/NotificationPresenterImpl.cpp

Index: Source/web/NotificationPresenterImpl.cpp
diff --git a/Source/web/NotificationPresenterImpl.cpp b/Source/web/NotificationPresenterImpl.cpp
index 1cc58476dc023862ffbc3be44dc509a00e39a087..49cab4ac6db5ad7ebe9fa2c8089827d49c9acb52 100644
--- a/Source/web/NotificationPresenterImpl.cpp
+++ b/Source/web/NotificationPresenterImpl.cpp
@@ -35,35 +35,13 @@
 #include "WebNotificationPermissionCallback.h"
 #include "WebNotificationPresenter.h"
 #include "core/dom/ExecutionContext.h"
-#include "modules/notifications/NotificationBase.h"
+#include "modules/notifications/Notification.h"
 #include "platform/weborigin/SecurityOrigin.h"
 
 using namespace WebCore;
 
 namespace blink {
 
-#if ENABLE(LEGACY_NOTIFICATIONS)
-class VoidCallbackClient : public WebNotificationPermissionCallback {
-public:
-    explicit VoidCallbackClient(PassOwnPtr<VoidCallback> callback)
-        : m_callback(callback)
-    {
-    }
-
-    virtual void permissionRequestComplete()
-    {
-        if (m_callback)
-            m_callback->handleEvent();
-        delete this;
-    }
-
-private:
-    virtual ~VoidCallbackClient() { }
-
-    OwnPtr<VoidCallback> m_callback;
-};
-#endif // ENABLE(LEGACY_NOTIFICATIONS)
-
 class NotificationPermissionCallbackClient : public WebNotificationPermissionCallback {
 public:
     NotificationPermissionCallbackClient(WebNotificationPresenter* presenter, PassRefPtr<SecurityOrigin> securityOrigin, PassOwnPtr<NotificationPermissionCallback> callback)
@@ -76,7 +54,7 @@ public:
     virtual void permissionRequestComplete()
     {
         if (m_callback)
-            m_callback->handleEvent(NotificationBase::permissionString(static_cast<NotificationClient::Permission>(m_presenter->checkPermission(WebSecurityOrigin(m_securityOrigin)))));
+            m_callback->handleEvent(Notification::permissionString(static_cast<NotificationClient::Permission>(m_presenter->checkPermission(WebSecurityOrigin(m_securityOrigin)))));
         delete this;
     }
 
@@ -98,19 +76,19 @@ bool NotificationPresenterImpl::isInitialized()
     return !!m_presenter;
 }
 
-bool NotificationPresenterImpl::show(NotificationBase* notification)
+bool NotificationPresenterImpl::show(Notification* notification)
 {
-    return m_presenter->show(PassRefPtr<NotificationBase>(notification));
+    return m_presenter->show(PassRefPtr<Notification>(notification));
 }
 
-void NotificationPresenterImpl::cancel(NotificationBase* notification)
+void NotificationPresenterImpl::cancel(Notification* notification)
 {
-    m_presenter->cancel(PassRefPtr<NotificationBase>(notification));
+    m_presenter->cancel(PassRefPtr<Notification>(notification));
 }
 
-void NotificationPresenterImpl::notificationObjectDestroyed(NotificationBase* notification)
+void NotificationPresenterImpl::notificationObjectDestroyed(Notification* notification)
 {
-    m_presenter->objectDestroyed(PassRefPtr<NotificationBase>(notification));
+    m_presenter->objectDestroyed(PassRefPtr<Notification>(notification));
 }
 
 NotificationClient::Permission NotificationPresenterImpl::checkPermission(ExecutionContext* context)
@@ -119,13 +97,6 @@ NotificationClient::Permission NotificationPresenterImpl::checkPermission(Execut
     return static_cast<NotificationClient::Permission>(result);
 }
 
-#if ENABLE(LEGACY_NOTIFICATIONS)
-void NotificationPresenterImpl::requestPermission(ExecutionContext* context, PassOwnPtr<VoidCallback> callback)
-{
-    m_presenter->requestPermission(WebSecurityOrigin(context->securityOrigin()), new VoidCallbackClient(callback));
-}
-#endif // ENABLE(LEGACY_NOTIFICATIONS)
-
 void NotificationPresenterImpl::requestPermission(ExecutionContext* context, WTF::PassOwnPtr<NotificationPermissionCallback> callback)
 {
     m_presenter->requestPermission(WebSecurityOrigin(context->securityOrigin()), new NotificationPermissionCallbackClient(m_presenter, context->securityOrigin(), callback));