Re-design Unsubscribe and getPermissionStatus mojo interfaces.

content/browser/push_messaging/push_messaging_manager.cc

Index: content/browser/push_messaging/push_messaging_manager.cc
diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/browser/push_messaging/push_messaging_manager.cc
index c3ee50ec8beda20e19320f2ac713876d06cc8ed6..50b0bf7b82db816aa79e7247645372e8cecf625b 100644
--- a/content/browser/push_messaging/push_messaging_manager.cc
+++ b/content/browser/push_messaging/push_messaging_manager.cc
@@ -643,21 +643,21 @@ void PushMessagingManager::DidUnregister(
     case PUSH_UNREGISTRATION_STATUS_SUCCESS_UNREGISTERED:
     case PUSH_UNREGISTRATION_STATUS_PENDING_NETWORK_ERROR:
     case PUSH_UNREGISTRATION_STATUS_PENDING_SERVICE_ERROR:
-      callback.Run(true /* success */, true /* did_unsubscribe */,
-                   blink::WebPushError::ErrorTypeUnknown,
+      callback.Run(blink::WebPushError::ErrorTypeNone /* success */,

[Peter Beverloo, 2017/02/27 09:32:50]

nit: you could drop the /* success */ now since the name implies it.

[ke.he, 2017/02/28 05:00:50]

Done.

+                   true /* did_unsubscribe */,
                    base::nullopt /* error_message */);
       break;
     case PUSH_UNREGISTRATION_STATUS_SUCCESS_WAS_NOT_REGISTERED:
-      callback.Run(true /* success */, false /* did_unsubscribe */,
-                   blink::WebPushError::ErrorTypeUnknown,
+      callback.Run(blink::WebPushError::ErrorTypeNone /* success */,
+                   false /* did_unsubscribe */,
                    base::nullopt /* error_message */);
       break;
     case PUSH_UNREGISTRATION_STATUS_NO_SERVICE_WORKER:
     case PUSH_UNREGISTRATION_STATUS_SERVICE_NOT_AVAILABLE:
     case PUSH_UNREGISTRATION_STATUS_STORAGE_ERROR:
-      callback.Run(
-          false /* error */, false, blink::WebPushError::ErrorTypeAbort,
-          std::string(PushUnregistrationStatusToString(unregistration_status)));
+      callback.Run(blink::WebPushError::ErrorTypeAbort /* error */, false,

[Peter Beverloo, 2017/02/27 09:32:50]

dito w/  /* error */, although the "false" after could use it.

[ke.he, 2017/02/28 05:00:50]

Done.

+                   std::string(PushUnregistrationStatusToString(
+                       unregistration_status)) /* error_message */);
       break;
     case PUSH_UNREGISTRATION_STATUS_NETWORK_ERROR:
       NOTREACHED();
@@ -811,8 +811,9 @@ void PushMessagingManager::GetPermissionStatus(
       service_worker_context_->GetLiveRegistration(
           service_worker_registration_id);
   if (!service_worker_registration) {
-    callback.Run(false /* error */, blink::WebPushPermissionStatusDenied,
-                 blink::WebPushError::ErrorTypeAbort);
+    // Return error: ErrorTypeAbort.
+    callback.Run(blink::WebPushError::ErrorTypeAbort,
+                 blink::WebPushPermissionStatusDenied);
     return;
   }
 
@@ -835,9 +836,9 @@ void PushMessagingManager::Core::GetPermissionStatusOnUI(
     if (!user_visible && !push_service->SupportNonVisibleMessages()) {
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
-          base::Bind(callback, false /* error */,
-                     blink::WebPushPermissionStatusDenied,
-                     blink::WebPushError::ErrorTypeNotSupported));
+          // Return error: ErrorTypeNotSupported.
+          base::Bind(callback, blink::WebPushError::ErrorTypeNotSupported,
+                     blink::WebPushPermissionStatusDenied));
       return;
     }
     permission_status =
@@ -846,16 +847,18 @@ void PushMessagingManager::Core::GetPermissionStatusOnUI(
     // Return prompt, so the website can't detect incognito mode.
     permission_status = blink::WebPushPermissionStatusPrompt;
   } else {
-    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-                            base::Bind(callback, false /* error */,
-                                       blink::WebPushPermissionStatusDenied,
-                                       blink::WebPushError::ErrorTypeAbort));
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        // Return error: ErrorTypeAbort.
+        base::Bind(callback, blink::WebPushError::ErrorTypeAbort,
+                   blink::WebPushPermissionStatusDenied));
     return;
   }
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      base::Bind(callback, true /* success */, permission_status,
-                 blink::WebPushError::ErrorTypeUnknown));
+      // Return success: |permission_status|.
+      base::Bind(callback, blink::WebPushError::ErrorTypeNone,
+                 permission_status));
 }
 
 // Helper methods on both IO and UI threads, merged from