Introduce the PushSubscription.curve25519dh attribute (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"
 #include "content/child/push_messaging/push_dispatcher.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/worker_task_runner.h"
 #include "content/common/push_messaging_messages.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubscription.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubscriptionOptions.h"
 
 namespace content {
 namespace {
 
 int CurrentWorkerId() {
   return WorkerTaskRunner::Instance()->CurrentWorkerId();
 }
 
 // Returns the id of the given |service_worker_registration|, which
 // is only available on the implementation of the interface.
-int64 GetServiceWorkerRegistrationId(
+int64_t GetServiceWorkerRegistrationId(
     blink::WebServiceWorkerRegistration* service_worker_registration) {
   return static_cast<WebServiceWorkerRegistrationImpl*>(
       service_worker_registration)->registration_id();
 }
 
 }  // namespace
 
 static base::LazyInstance<base::ThreadLocalPointer<PushProvider>>::Leaky
     g_push_provider_tls = LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 26 matching lines @@
 }
 
 void PushProvider::subscribe(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     const blink::WebPushSubscriptionOptions& options,
     blink::WebPushSubscriptionCallbacks* callbacks) {
   DCHECK(service_worker_registration);
   DCHECK(callbacks);
   int request_id = push_dispatcher_->GenerateRequestId(CurrentWorkerId());
   subscription_callbacks_.AddWithID(callbacks, request_id);
-  int64 service_worker_registration_id =
+  int64_t service_worker_registration_id =
       GetServiceWorkerRegistrationId(service_worker_registration);
   thread_safe_sender_->Send(new PushMessagingHostMsg_SubscribeFromWorker(
       request_id, service_worker_registration_id, options.userVisibleOnly));
 }
 
 void PushProvider::unsubscribe(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     blink::WebPushUnsubscribeCallbacks* callbacks) {
   DCHECK(service_worker_registration);
   DCHECK(callbacks);
 
   int request_id = push_dispatcher_->GenerateRequestId(CurrentWorkerId());
   unsubscribe_callbacks_.AddWithID(callbacks, request_id);
 
-  int64 service_worker_registration_id =
+  int64_t service_worker_registration_id =
       GetServiceWorkerRegistrationId(service_worker_registration);
   thread_safe_sender_->Send(new PushMessagingHostMsg_Unsubscribe(
       request_id, service_worker_registration_id));
 }
 
 void PushProvider::getSubscription(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     blink::WebPushSubscriptionCallbacks* callbacks) {
   DCHECK(service_worker_registration);
   DCHECK(callbacks);
   int request_id = push_dispatcher_->GenerateRequestId(CurrentWorkerId());
   subscription_callbacks_.AddWithID(callbacks, request_id);
-  int64 service_worker_registration_id =
+  int64_t service_worker_registration_id =
       GetServiceWorkerRegistrationId(service_worker_registration);
   thread_safe_sender_->Send(new PushMessagingHostMsg_GetRegistration(
       request_id, service_worker_registration_id));
 }
 
 void PushProvider::getPermissionStatus(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     const blink::WebPushSubscriptionOptions& options,
     blink::WebPushPermissionStatusCallbacks* callbacks) {
   DCHECK(service_worker_registration);
   DCHECK(callbacks);
   int request_id = push_dispatcher_->GenerateRequestId(CurrentWorkerId());
   permission_status_callbacks_.AddWithID(callbacks, request_id);
-  int64 service_worker_registration_id =
+  int64_t service_worker_registration_id =
       GetServiceWorkerRegistrationId(service_worker_registration);
   thread_safe_sender_->Send(new PushMessagingHostMsg_GetPermissionStatus(
       request_id, service_worker_registration_id, options.userVisibleOnly));
 }
 
 bool PushProvider::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PushProvider, message)
     IPC_MESSAGE_HANDLER(PushMessagingMsg_SubscribeFromWorkerSuccess,
                         OnSubscribeFromWorkerSuccess);
@@ skipping 12 matching lines @@
     IPC_MESSAGE_HANDLER(PushMessagingMsg_GetPermissionStatusError,
                         OnGetPermissionStatusError);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void PushProvider::OnSubscribeFromWorkerSuccess(
     int request_id,
-    const GURL& endpoint) {
+    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));
+      new blink::WebPushSubscription(endpoint, curve25519dh));
   callbacks->onSuccess(subscription.release());
 
   subscription_callbacks_.Remove(request_id);
 }
 
 void PushProvider::OnSubscribeFromWorkerError(int request_id,
                                               PushRegistrationStatus status) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   if (!callbacks)
@@ skipping 29 matching lines @@
 
   scoped_ptr<blink::WebPushError> error(new blink::WebPushError(
       error_type, blink::WebString::fromUTF8(error_message)));
   callbacks->onError(error.release());
 
   unsubscribe_callbacks_.Remove(request_id);
 }
 
 void PushProvider::OnGetRegistrationSuccess(
     int request_id,
-    const GURL& endpoint) {
+    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));
+      new blink::WebPushSubscription(endpoint, curve25519dh));
   callbacks->onSuccess(subscription.release());
 
   subscription_callbacks_.Remove(request_id);
 }
 
 void PushProvider::OnGetRegistrationError(
     int request_id,
     PushGetRegistrationStatus status) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
@@ skipping 36 matching lines @@
 
   scoped_ptr<blink::WebPushError> web_error(new blink::WebPushError(
       error, blink::WebString::fromUTF8(error_message)));
 
   callbacks->onError(web_error.release());
 
   permission_status_callbacks_.Remove(request_id);
 }
 
 }  // namespace content