Revert of Partial implementation of subscription restrictions.

content/shell/browser/layout_test/layout_test_push_messaging_service.cc

Index: content/shell/browser/layout_test/layout_test_push_messaging_service.cc
diff --git a/content/shell/browser/layout_test/layout_test_push_messaging_service.cc b/content/shell/browser/layout_test/layout_test_push_messaging_service.cc
index c346a0851992cd897c5b0511b69e88a7f2fed239..11554e94baa11c1d8698777aae352b481c3e29b9 100644
--- a/content/shell/browser/layout_test/layout_test_push_messaging_service.cc
+++ b/content/shell/browser/layout_test/layout_test_push_messaging_service.cc
@@ -8,7 +8,6 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "content/public/browser/permission_type.h"
-#include "content/public/common/push_subscription_options.h"
 #include "content/shell/browser/layout_test/layout_test_browser_context.h"
 #include "content/shell/browser/layout_test/layout_test_content_browser_client.h"
 #include "content/shell/browser/layout_test/layout_test_permission_manager.h"
@@ -68,20 +67,22 @@
 void LayoutTestPushMessagingService::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 PushMessagingService::RegisterCallback& callback) {
   SubscribeFromWorker(requesting_origin, service_worker_registration_id,
-                      options, callback);
+                      sender_id, user_visible, callback);
 }
 
 void LayoutTestPushMessagingService::SubscribeFromWorker(
     const GURL& requesting_origin,
     int64_t service_worker_registration_id,
-    const PushSubscriptionOptions& options,
+    const std::string& sender_id,
+    bool user_visible,
     const PushMessagingService::RegisterCallback& callback) {
-  if (GetPermissionStatus(requesting_origin, options.user_visible_only) ==
+  if (GetPermissionStatus(requesting_origin, user_visible) ==
       blink::WebPushPermissionStatusGranted) {
     std::vector<uint8_t> p256dh(
         kTestP256Key, kTestP256Key + arraysize(kTestP256Key));