Re-design Unsubscribe and getPermissionStatus mojo interfaces.

content/browser/push_messaging/push_messaging_manager.cc

 // 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 "content/browser/push_messaging/push_messaging_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 625 matching lines @@
 
 void PushMessagingManager::DidUnregister(
     const UnsubscribeCallback& callback,
     PushUnregistrationStatus unregistration_status) {
   // Only called from IO thread, but would be safe to call from UI thread.
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   switch (unregistration_status) {
     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();
       break;
   }
   RecordUnregistrationStatus(unregistration_status);
 }
 
 // GetSubscription methods on both IO and UI threads, merged in order of use
 // from PushMessagingManager and Core.
@@ skipping 133 matching lines @@
 
 void PushMessagingManager::GetPermissionStatus(
     int64_t service_worker_registration_id,
     bool user_visible,
     const GetPermissionStatusCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   ServiceWorkerRegistration* service_worker_registration =
       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;
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&Core::GetPermissionStatusOnUI,
                  base::Unretained(ui_core_.get()), callback,
                  service_worker_registration->pattern().GetOrigin(),
                  user_visible));
 }
 
 void PushMessagingManager::Core::GetPermissionStatusOnUI(
     const GetPermissionStatusCallback& callback,
     const GURL& requesting_origin,
     bool user_visible) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   blink::WebPushPermissionStatus permission_status;
   PushMessagingService* push_service = service();
   if (push_service) {
     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 =
         push_service->GetPermissionStatus(requesting_origin, user_visible);
   } else if (is_incognito()) {
     // 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
 // PushMessagingManager and Core.
 // -----------------------------------------------------------------------------
 
 void PushMessagingManager::Core::GetEncryptionInfoOnUI(
     const GURL& origin,
     int64_t service_worker_registration_id,
     const std::string& sender_id,
@@ skipping 25 matching lines @@
 PushMessagingService* PushMessagingManager::Core::service() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   RenderProcessHost* process_host =
       RenderProcessHost::FromID(render_process_id_);
   return process_host
              ? process_host->GetBrowserContext()->GetPushMessagingService()
              : nullptr;
 }
 
 }  // namespace content