Revert of Partial implementation of subscription restrictions.

chrome/browser/push_messaging/push_messaging_service_unittest.cc

Index: chrome/browser/push_messaging/push_messaging_service_unittest.cc
diff --git a/chrome/browser/push_messaging/push_messaging_service_unittest.cc b/chrome/browser/push_messaging/push_messaging_service_unittest.cc
index 19167e4b1e75482f415716974daf48fc9a16270d..a68e0d1c9d186c3601c48c7604694e797391892c 100644
--- a/chrome/browser/push_messaging/push_messaging_service_unittest.cc
+++ b/chrome/browser/push_messaging/push_messaging_service_unittest.cc
@@ -27,7 +27,6 @@
 #include "components/gcm_driver/fake_gcm_client_factory.h"
 #include "components/gcm_driver/gcm_profile_service.h"
 #include "content/public/common/push_event_payload.h"
-#include "content/public/common/push_subscription_options.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -154,11 +153,8 @@
 
   // (2) Subscribe for Push Messaging, and verify that we've got the required
   // information in order to be able to create encrypted messages.
-  content::PushSubscriptionOptions options;
-  options.user_visible_only = true;
-  options.sender_info = kTestSenderId;
   push_service->SubscribeFromWorker(
-      origin, kTestServiceWorkerId, options,
+      origin, kTestServiceWorkerId, kTestSenderId, true /* user_visible */,
       base::Bind(&PushMessagingServiceTest::DidRegister, base::Unretained(this),
                  &subscription_id, &p256dh, &auth));