Re-design Unsubscribe and getPermissionStatus mojo interfaces.

content/common/push_messaging.mojom

 // Copyright 2017 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.
 
 module content.mojom;
 
 import "url/mojo/url.mojom";
 
 // TODO(heke): The type-mapping struct and enums are duplicately defined. Need
 // to remove/replace those defined in content or blink namespace.
@@ skipping 61 matching lines @@
   // previously logged data. When making changes, also update the enum list
   // in tools/metrics/histograms/histograms.xml to keep it in sync, and
   // update LAST below.
 
   LAST = SENDER_ID_MISMATCH
 };
 
 enum PushErrorType {
   ABORT = 0,
   NETWORK = 1,
-  NOT_ALLOWED = 2,
-  NOT_FOUND = 3,
-  NOT_SUPPORTED = 4,
-  UNKNOWN = 5,
+  NONE = 2,
+  NOT_ALLOWED = 3,
+  NOT_FOUND = 4,
+  NOT_SUPPORTED = 5,
   INVALID_STATE = 6,
   LAST = INVALID_STATE
 };
 
 // Push getregistration success/error codes for internal use & reporting in UMA.
 // Enum values can be added, but must never be renumbered or deleted and reused.
 enum PushGetRegistrationStatus {
   // Getting the registration was successful.
   SUCCESS = 0,
 
@@ skipping 31 matching lines @@
 interface PushMessaging {
   Subscribe(int32 render_frame_id,
             int64 service_worker_registration_id,
             PushSubscriptionOptions options)
            => (PushRegistrationStatus status,
                url.mojom.Url? endpoint,
                PushSubscriptionOptions? options,
                array<uint8>? p256dh,
                array<uint8>? auth);
 
-  // It returns |did_unsubscribe| if is_success is true, and returns
-  // |error_type| and |error_message| if is_success is false.
+  // We use the value of |error_type| as a flag. If |error_type| == NONE, it
+  // means no error and returns |did_unsubscribe|. Else, it means there is an
+  // error and returns |error_type| and |error_message|.
   Unsubscribe(int64 service_worker_registration_id)
-             => (bool is_success,
+             => (PushErrorType error_type,
                  bool did_unsubscribe,
-                 PushErrorType error_type,
                  string? error_message);
 
   GetSubscription(int64 service_worker_registration_id)
                  => (PushGetRegistrationStatus status,
                      url.mojom.Url? endpoint,
                      PushSubscriptionOptions? options,
                      array<uint8>? p256dh,
                      array<uint8>? auth);
 
-  // It returns |status| if |is_success| is true and returns |error| if
-  // |is_success| is false.
+  // We use the value of |error_type| as a flag. If |error_type| == NONE, it
+  // means no error and returns |status|. Else, it means there is an error and
+  // returns |error_type|.
   GetPermissionStatus(int64 service_worker_registration_id,
                       bool user_visible)
-                     => (bool is_success,
-                         // |status| is meaningful when (is_success == true)
-                         PushPermissionStatus status,
-                         // |error| is meaningful when (is_success == false)
-                         PushErrorType error);
+                     => (PushErrorType error_type,
+                         PushPermissionStatus status);
 };