[PushMessaging] Use appopriate type parameters for WebCallbacks (2/3).

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 "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
@@ skipping 137 matching lines @@
 
 void PushProvider::OnSubscribeFromWorkerSuccess(
     int request_id,
     const GURL& endpoint,
     const std::vector<uint8_t>& curve25519dh) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
-  scoped_ptr<blink::WebPushSubscription> subscription(
-      new blink::WebPushSubscription(endpoint, curve25519dh));
-  callbacks->onSuccess(subscription.release());
+  callbacks->onSuccess(blink::adoptWebPtr(
+      new blink::WebPushSubscription(endpoint, curve25519dh)));
 
   subscription_callbacks_.Remove(request_id);
 }
 
 void PushProvider::OnSubscribeFromWorkerError(int request_id,
                                               PushRegistrationStatus status) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
-  scoped_ptr<blink::WebPushError> error(new blink::WebPushError(
+  callbacks->onError(blink::WebPushError(
       blink::WebPushError::ErrorTypeAbort,
       blink::WebString::fromUTF8(PushRegistrationStatusToString(status))));
-  callbacks->onError(error.release());
 
   subscription_callbacks_.Remove(request_id);
 }
 
 void PushProvider::OnUnsubscribeSuccess(int request_id, bool did_unsubscribe) {
   blink::WebPushUnsubscribeCallbacks* callbacks =
       unsubscribe_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
@@ skipping 19 matching lines @@
 
 void PushProvider::OnGetRegistrationSuccess(
     int request_id,
     const GURL& endpoint,
     const std::vector<uint8_t>& curve25519dh) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
-  scoped_ptr<blink::WebPushSubscription> subscription(
-      new blink::WebPushSubscription(endpoint, curve25519dh));
-  callbacks->onSuccess(subscription.release());
+  callbacks->onSuccess(blink::adoptWebPtr(
+      new blink::WebPushSubscription(endpoint, curve25519dh)));
 
   subscription_callbacks_.Remove(request_id);
 }
 
 void PushProvider::OnGetRegistrationError(
     int request_id,
     PushGetRegistrationStatus status) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
   // We are only expecting an error if we can't find a registration.
   callbacks->onSuccess(nullptr);
 
   subscription_callbacks_.Remove(request_id);
 }
 
 void PushProvider::OnGetPermissionStatusSuccess(
     int request_id,
     blink::WebPushPermissionStatus status) {
   blink::WebPushPermissionStatusCallbacks* callbacks =
       permission_status_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
-  callbacks->onSuccess(&status);
+  callbacks->onSuccess(status);
 
   permission_status_callbacks_.Remove(request_id);
 }
 
 void PushProvider::OnGetPermissionStatusError(
     int request_id,
     blink::WebPushError::ErrorType error) {
   blink::WebPushPermissionStatusCallbacks* callbacks =
       permission_status_callbacks_.Lookup(request_id);
   if (!callbacks)
     return;
 
   std::string error_message;
   if (error == blink::WebPushError::ErrorTypeNotSupported) {
     error_message =
         "Push subscriptions that don't enable userVisibleOnly are not "
         "supported.";
   }
 
-  scoped_ptr<blink::WebPushError> web_error(new blink::WebPushError(
+  callbacks->onError(blink::WebPushError(
       error, blink::WebString::fromUTF8(error_message)));
 
-  callbacks->onError(web_error.release());
-
   permission_status_callbacks_.Remove(request_id);
 }
 
 }  // namespace content