Revert of Partial implementation of subscription restrictions.

content/public/browser/push_messaging_service.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_PUSH_MESSAGING_SERVICE_H_
 #define CONTENT_PUBLIC_BROWSER_PUSH_MESSAGING_SERVICE_H_
 
 #include <stdint.h>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "content/common/content_export.h"
 #include "content/public/common/push_messaging_status.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushPermissionStatus.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class BrowserContext;
 class ServiceWorkerContext;
-struct PushSubscriptionOptions;
 
 // A push service-agnostic interface that the Push API uses for talking to
 // push messaging services like GCM. Must only be used on the UI thread.
 class CONTENT_EXPORT PushMessagingService {
  public:
   using RegisterCallback =
       base::Callback<void(const std::string& registration_id,
                           const std::vector<uint8_t>& p256dh,
                           const std::vector<uint8_t>& auth,
                           PushRegistrationStatus status)>;
@@ skipping 10 matching lines @@
 
   using ResultCallback = base::Callback<void(bool success)>;
 
   virtual ~PushMessagingService() {}
 
   // Returns the absolute URL exposed by the push server where the webapp server
   // can send push messages. This is currently assumed to be the same for all
   // origins and push registrations.
   virtual GURL GetPushEndpoint() = 0;
 
-  // Subscribe the given |options.sender_info| with the push messaging service
-  // in a document context. The frame is known and a permission UI may be
-  // displayed to the user.
+  // Subscribe the given |sender_id| with the push messaging service in a
+  // document context. The frame is known and a permission UI may be displayed
+  // to the user.
   virtual void SubscribeFromDocument(const GURL& requesting_origin,
                                      int64_t service_worker_registration_id,
+                                     const std::string& sender_id,
                                      int renderer_id,
                                      int render_frame_id,
-                                     const PushSubscriptionOptions& options,
+                                     bool user_visible,
                                      const RegisterCallback& callback) = 0;
 
-  // Subscribe the given |options.sender_info| with the push messaging service.
-  // The frame is not known so if permission was not previously granted by the
-  // user this request should fail.
+  // Subscribe the given |sender_id| with the push messaging service. The frame
+  // is not known so if permission was not previously granted by the user this
+  // request should fail.
   virtual void SubscribeFromWorker(const GURL& requesting_origin,
                                    int64_t service_worker_registration_id,
-                                   const PushSubscriptionOptions& options,
+                                   const std::string& sender_id,
+                                   bool user_visible,
                                    const RegisterCallback& callback) = 0;
 
   // Retrieves the encryption information associated with the subscription
   // associated to |origin| and |service_worker_registration_id|.
   virtual void GetEncryptionInfo(const GURL& origin,
                                  int64_t service_worker_registration_id,
                                  const EncryptionInfoCallback& callback) = 0;
 
   // Unsubscribe the given |sender_id| from the push messaging service. The
   // subscription will be synchronously deactivated locally, and asynchronously
@@ skipping 40 matching lines @@
   // |service_worker_registration_id| for the given |origin|.
   static void ClearPushSubscriptionID(BrowserContext* browser_context,
                                       const GURL& origin,
                                       int64_t service_worker_registration_id,
                                       const base::Closure& callback);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_PUSH_MESSAGING_SERVICE_H_