Rename PushPermissionCallback to PushPermissionStatusCallback [1/3]

Patch dependency:
[1] Blink: https://crrev.com/702003004/ (THIS PATCH)
[2] Chromium: https://crrev.com/690833004/
[3] Blink: https://crrev.com/708543002/

BUG=430527

Review URL: https://codereview.chromium.org/702003004

git-svn-id: svn://svn.chromium.org/blink/trunk@184906 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/modules/modules.gypi

@@ -702,8 +702,8 @@
       'push_messaging/PushEvent.h',
       'push_messaging/PushManager.cpp',
       'push_messaging/PushManager.h',
-      'push_messaging/PushPermissionCallback.cpp',
-      'push_messaging/PushPermissionCallback.h',
+      'push_messaging/PushPermissionStatusCallback.cpp',
+      'push_messaging/PushPermissionStatusCallback.h',
       'push_messaging/PushRegistration.cpp',
       'push_messaging/PushRegistration.h',
       'push_messaging/ServiceWorkerGlobalScopePush.h',

third_party/WebKit/Source/modules/push_messaging/PushManager.cpp

@@ -16,7 +16,7 @@
 #include "core/frame/LocalDOMWindow.h"
 #include "modules/push_messaging/PushController.h"
 #include "modules/push_messaging/PushError.h"
-#include "modules/push_messaging/PushPermissionCallback.h"
+#include "modules/push_messaging/PushPermissionStatusCallback.h"
 #include "modules/push_messaging/PushRegistration.h"
 #include "modules/serviceworkers/NavigatorServiceWorker.h"
 #include "modules/serviceworkers/ServiceWorkerContainer.h"
@@ -72,7 +72,7 @@ ScriptPromise PushManager::hasPermission(ScriptState* scriptState)
 
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
 
-    client->getPermissionStatus(new PushPermissionCallback(resolver), serviceWorkerProvider);
+    client->getPermissionStatus(new PushPermissionStatusCallback(resolver), serviceWorkerProvider);
     return resolver->promise();
 }
 

third_party/WebKit/Source/modules/push_messaging/PushPermissionCallback.cpp → third_party/WebKit/Source/modules/push_messaging/PushPermissionStatusCallback.cpp

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "config.h"
-#include "modules/push_messaging/PushPermissionCallback.h"
+#include "modules/push_messaging/PushPermissionStatusCallback.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/ExceptionCode.h"
@@ -11,27 +11,27 @@
 
 namespace blink {
 
-PushPermissionCallback::PushPermissionCallback(PassRefPtr<ScriptPromiseResolver> resolver)
+PushPermissionStatusCallback::PushPermissionStatusCallback(PassRefPtr<ScriptPromiseResolver> resolver)
     : m_resolver(resolver)
 {
 }
 
-PushPermissionCallback::~PushPermissionCallback()
+PushPermissionStatusCallback::~PushPermissionStatusCallback()
 {
 }
 
-void PushPermissionCallback::onSuccess(WebPushPermissionStatus* status)
+void PushPermissionStatusCallback::onSuccess(WebPushPermissionStatus* status)
 {
     m_resolver->resolve(permissionString(*status));
 }
 
-void PushPermissionCallback::onError()
+void PushPermissionStatusCallback::onError()
 {
     m_resolver->reject();
 }
 
 // static
-const String& PushPermissionCallback::permissionString(WebPushPermissionStatus status)
+const String& PushPermissionStatusCallback::permissionString(WebPushPermissionStatus status)
 {
     DEFINE_STATIC_LOCAL(const String, grantedPermission, ("granted"));
     DEFINE_STATIC_LOCAL(const String, deniedPermission, ("denied"));

third_party/WebKit/Source/modules/push_messaging/PushPermissionCallback.h → third_party/WebKit/Source/modules/push_messaging/PushPermissionStatusCallback.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PushPermissionCallback_h
-#define PushPermissionCallback_h
+#ifndef PushPermissionStatusCallback_h
+#define PushPermissionStatusCallback_h
 
 #include "public/platform/WebPushClient.h"
 #include "public/platform/WebPushPermissionStatus.h"
@@ -20,12 +20,12 @@ namespace blink {
 class ScriptPromiseResolver;
 
 // Will resolve the underlying promise depending on the permission passed to the callback.
-class PushPermissionCallback final : public WebPushPermissionCallback {
-    WTF_MAKE_NONCOPYABLE(PushPermissionCallback);
+class PushPermissionStatusCallback final : public WebPushPermissionStatusCallback {
+    WTF_MAKE_NONCOPYABLE(PushPermissionStatusCallback);
 
 public:
-    explicit PushPermissionCallback(PassRefPtr<ScriptPromiseResolver>);
-    virtual ~PushPermissionCallback();
+    explicit PushPermissionStatusCallback(PassRefPtr<ScriptPromiseResolver>);
+    virtual ~PushPermissionStatusCallback();
 
     void onSuccess(WebPushPermissionStatus*) override;
 
@@ -39,4 +39,4 @@ private:
 
 } // namespace blink
 
-#endif // PushPermissionCallback_h
+#endif // PushPermissionStatusCallback_h

third_party/WebKit/public/platform/WebPushClient.h

@@ -15,7 +15,9 @@ class WebServiceWorkerProvider;
 struct WebPushRegistration;
 
 typedef WebCallbacks<WebPushRegistration, WebPushError> WebPushRegistrationCallbacks;
+// FIXME: Delete WebPushPermissionCallback once the embedder stops depending on it.
 typedef WebCallbacks<WebPushPermissionStatus, void> WebPushPermissionCallback;
+typedef WebCallbacks<WebPushPermissionStatus, void> WebPushPermissionStatusCallback;
 
 class WebPushClient {
 public:
@@ -25,9 +27,9 @@ public:
     // client. Ownership of the WebServiceWorkerProvider is not transferred.
     virtual void registerPushMessaging(WebPushRegistrationCallbacks*, WebServiceWorkerProvider*) { }
 
-    // Ownership of the WebPushPermissionCallback is transferred to the
+    // Ownership of the WebPushPermissionStatusCallback is transferred to the
     // client. Ownership of the WebServiceWorkerProvider is not transferred.
-    virtual void getPermissionStatus(WebPushPermissionCallback*, WebServiceWorkerProvider*) { }
+    virtual void getPermissionStatus(WebPushPermissionStatusCallback*, WebServiceWorkerProvider*) { }
 };
 
 } // namespace blink