Revert of Partial implementation of subscription restrictions.

chrome/browser/push_messaging/push_messaging_service_impl.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 CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
 #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
 
 #include <stdint.h>
 #include <set>
 #include <vector>
@@ skipping 17 matching lines @@
 #include "content/public/common/push_messaging_status.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushPermissionStatus.h"
 
 #if defined(ENABLE_NOTIFICATIONS)
 #include "chrome/browser/push_messaging/push_messaging_notification_manager.h"
 #endif
 
 class Profile;
 class PushMessagingAppIdentifier;
 class PushMessagingServiceObserver;
-struct PushSubscriptionOptions;
 
 namespace gcm {
 class GCMDriver;
 class GCMProfileService;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
@@ skipping 19 matching lines @@
       const gcm::GCMClient::SendErrorDetails& send_error_details) override;
   void OnSendAcknowledged(const std::string& app_id,
                           const std::string& message_id) override;
   bool CanHandle(const std::string& app_id) const override;
 
   // content::PushMessagingService implementation:
   GURL GetPushEndpoint() override;
   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 content::PushSubscriptionOptions& options,
+      bool user_visible,
       const content::PushMessagingService::RegisterCallback& callback) override;
   void SubscribeFromWorker(
       const GURL& requesting_origin,
       int64_t service_worker_registration_id,
-      const content::PushSubscriptionOptions& options,
+      const std::string& sender_id,
+      bool user_visible,
       const content::PushMessagingService::RegisterCallback& callback) override;
   void GetEncryptionInfo(
       const GURL& origin,
       int64_t service_worker_registration_id,
       const content::PushMessagingService::EncryptionInfoCallback& callback)
       override;
   void Unsubscribe(
       const GURL& requesting_origin,
       int64_t service_worker_registration_id,
       const std::string& sender_id,
@@ skipping 61 matching lines @@
 
   void DidSubscribeWithEncryptionInfo(
       const PushMessagingAppIdentifier& app_identifier,
       const content::PushMessagingService::RegisterCallback& callback,
       const std::string& subscription_id,
       const std::string& p256dh,
       const std::string& auth_secret);
 
   void DidRequestPermission(
       const PushMessagingAppIdentifier& app_identifier,
-      const content::PushSubscriptionOptions& options,
+      const std::string& sender_id,
       const content::PushMessagingService::RegisterCallback& callback,
       content::PermissionStatus permission_status);
 
   // GetEncryptionInfo method --------------------------------------------------
 
   void DidGetEncryptionInfo(
       const PushMessagingService::EncryptionInfoCallback& callback,
       const std::string& p256dh,
       const std::string& auth_secret) const;
 
@@ skipping 57 matching lines @@
   MessageDispatchedCallback message_dispatched_callback_for_testing_;
 
   scoped_ptr<PushMessagingServiceObserver> push_messaging_service_observer_;
 
   base::WeakPtrFactory<PushMessagingServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PushMessagingServiceImpl);
 };
 
 #endif  // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_