Revert of Partial implementation of subscription restrictions.

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"
@@ skipping 57 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_t service_worker_registration_id =
       GetServiceWorkerRegistrationId(service_worker_registration);
-  PushSubscriptionOptions content_options;
-  content_options.user_visible_only = options.userVisibleOnly;
-  content_options.sender_info = options.applicationServerKey.utf8();
   thread_safe_sender_->Send(new PushMessagingHostMsg_SubscribeFromWorker(
-      request_id, service_worker_registration_id, content_options));
+      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);
@@ skipping 172 matching lines @@
         "supported.";
   }
 
   callbacks->onError(
       blink::WebPushError(error, blink::WebString::fromUTF8(error_message)));
 
   permission_status_callbacks_.Remove(request_id);
 }
 
 }  // namespace content