Push API: Implement and ship PushSubscription.options

content/browser/push_messaging/push_messaging_message_filter.h

Index: content/browser/push_messaging/push_messaging_message_filter.h
diff --git a/content/browser/push_messaging/push_messaging_message_filter.h b/content/browser/push_messaging/push_messaging_message_filter.h
index 1e353355cf6a1f0d7ca9059b0b222fbbb97fceaa..faa52c440db71afda0907ea036a428134095ff2e 100644
--- a/content/browser/push_messaging/push_messaging_message_filter.h
+++ b/content/browser/push_messaging/push_messaging_message_filter.h
@@ -121,19 +121,15 @@ class PushMessagingMessageFilter : public BrowserMessageFilter {
   void OnGetSubscription(int request_id,
                          int64_t service_worker_registration_id);
 
-  void DidGetSenderInfo(int request_id,
-                        int64_t service_worker_registration_id,
-                        const std::vector<std::string>& sender_info,
-                        ServiceWorkerStatusCode status);
-
-  void DidGetSubscription(int request_id,
-                          int64_t service_worker_registration_id,
-                          bool uses_standard_protocol,
-                          const std::vector<std::string>& push_subscription_id,
-                          ServiceWorkerStatusCode status);
+  void DidGetSubscription(
+      int request_id,
+      int64_t service_worker_registration_id,
+      const std::vector<std::string>& push_subscription_id_and_sender_info,
+      ServiceWorkerStatusCode service_worker_status);
 
   void DidGetSubscriptionKeys(int request_id,
                               const GURL& endpoint,
+                              const std::string& sender_info,
                               bool success,
                               const std::vector<uint8_t>& p256dh,
                               const std::vector<uint8_t>& auth);