Re-design Unsubscribe and getPermissionStatus mojo interfaces.

content/child/push_messaging/push_provider.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/child/push_messaging/push_provider.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind_helpers.h"
@@ skipping 166 matching lines @@
   push_messaging_manager_->Unsubscribe(
       service_worker_registration_id,
       // Safe to use base::Unretained because |push_messaging_manager_ |is owned
       // by |this|.
       base::Bind(&PushProvider::DidUnsubscribe, base::Unretained(this),
                  base::Passed(&callbacks)));
 }
 
 void PushProvider::DidUnsubscribe(
     std::unique_ptr<blink::WebPushUnsubscribeCallbacks> callbacks,
-    bool is_success,
+    blink::WebPushError::ErrorType error_type,
     bool did_unsubscribe,
-    blink::WebPushError::ErrorType error_type,
     const base::Optional<std::string>& error_message) {
   DCHECK(callbacks);
 
-  if (is_success) {
+  // ErrorTypeNone indicates success.
+  if (error_type == blink::WebPushError::ErrorTypeNone) {
     callbacks->onSuccess(did_unsubscribe);
   } else {
     callbacks->onError(blink::WebPushError(
         error_type, blink::WebString::fromUTF8(error_message->c_str())));
   }
 }
 
 void PushProvider::getSubscription(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     std::unique_ptr<blink::WebPushSubscriptionCallbacks> callbacks) {
@@ skipping 49 matching lines @@
   push_messaging_manager_->GetPermissionStatus(
       service_worker_registration_id, options.userVisibleOnly,
       // Safe to use base::Unretained because |push_messaging_manager_ |is owned
       // by |this|.
       base::Bind(&PushProvider::DidGetPermissionStatus, base::Unretained(this),
                  base::Passed(&callbacks)));
 }
 
 void PushProvider::DidGetPermissionStatus(
     std::unique_ptr<blink::WebPushPermissionStatusCallbacks> callbacks,
-    bool is_success,
-    blink::WebPushPermissionStatus status,
-    blink::WebPushError::ErrorType error) {
+    blink::WebPushError::ErrorType error_type,
+    blink::WebPushPermissionStatus status) {
   DCHECK(callbacks);
-
-  if (is_success) {
+  // ErrorTypeNone indicates success.
+  if (error_type == blink::WebPushError::ErrorTypeNone) {
     callbacks->onSuccess(status);
   } else {
     std::string error_message;
-    if (error == blink::WebPushError::ErrorTypeNotSupported) {
+    if (error_type == blink::WebPushError::ErrorTypeNotSupported) {
       error_message =
           "Push subscriptions that don't enable userVisibleOnly are not "
           "supported.";
     }
-    callbacks->onError(
-        blink::WebPushError(error, blink::WebString::fromUTF8(error_message)));
+    callbacks->onError(blink::WebPushError(
+        error_type, blink::WebString::fromUTF8(error_message)));
   }
 }
 
 }  // namespace content