Remove support for the "gcm_user_visible_only" manifest key.

content/renderer/push_messaging/push_messaging_dispatcher.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/renderer/push_messaging/push_messaging_dispatcher.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/common/push_messaging_messages.h"
 #include "content/renderer/manifest/manifest_manager.h"
 #include "content/renderer/render_frame_impl.h"
 #include "ipc/ipc_message.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerRegistration.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushError.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubscription.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubscriptionOptions.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "url/gurl.h"
 
 using blink::WebString;
 
 namespace content {
 
-const char kManifestDeprecationWarning[] =
-    "The 'gcm_user_visible_only' manifest key is deprecated and will be "
-    "removed in Chrome 45, around August 2015. Use pushManager.subscribe({"
-    "userVisibleOnly: true}) instead. See https://goo.gl/RHFwWx for more "
-    "details.";
-
 PushMessagingDispatcher::PushMessagingDispatcher(RenderFrame* render_frame)
     : RenderFrameObserver(render_frame) {
 }
 
 PushMessagingDispatcher::~PushMessagingDispatcher() {}
 
 bool PushMessagingDispatcher::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PushMessagingDispatcher, message)
     IPC_MESSAGE_HANDLER(PushMessagingMsg_SubscribeFromDocumentSuccess,
@@ skipping 33 matching lines @@
   std::string sender_id =
       manifest.gcm_sender_id.is_null()
           ? std::string()
           : base::UTF16ToUTF8(manifest.gcm_sender_id.string());
   if (sender_id.empty()) {
     OnSubscribeFromDocumentError(request_id,
                                  PUSH_REGISTRATION_STATUS_NO_SENDER_ID);
     return;
   }
 
-  // Support for the "gcm_user_visible_only" Manifest key has been deprecated
-  // in favor of the userVisibleOnly subscription option, and will be removed
-  // in a future Chrome release. Inform developers of this deprecation.
-  if (manifest.gcm_user_visible_only && !options.userVisibleOnly) {
-    blink::WebConsoleMessage message(
-        blink::WebConsoleMessage::LevelWarning,
-        blink::WebString::fromUTF8(kManifestDeprecationWarning));
-
-    render_frame()->GetWebFrame()->addMessageToConsole(message);

[johnme, 2015/05/28 12:35:12]

Please continue logging a warning, since developers are likely to ignore the
deprecation warning whilst things continue working, and only try to debug once
things have broken. Something like:

const char kUserVisibleWarning[] = "Chrome currently only allows push messages
that result in a user-visible notification. Websites must indicate their
understanding of this by calling pushManager.subscribe({userVisibleOnly: true}).
Without this permission will be denied. Note that previously a website could
pass a 'gcm_user_visible_only' manifest key; this was deprecated in Chrome 44
and removed in Chrome 45. See
https://docs.google.com/document/d/13VxFdLJbMwxHrvnpDm8RXnU41W2ZlcP0mdWWe9zXQ...
for more details.";

if (!options.userVisibleOnly) {
    log the warning
}

[Peter Beverloo, 2015/05/29 14:15:31]

I agree with the warning, but we shouldn't have it here. Added it in
PushMessagingServiceImpl using a new RFH API I introduce here:

https://codereview.chromium.org/1154673005/

-  }
-
-  const bool user_visible = manifest.gcm_user_visible_only ||
-                            options.userVisibleOnly;
-
   Send(new PushMessagingHostMsg_SubscribeFromDocument(
       routing_id(), request_id,
       manifest.gcm_sender_id.is_null()
           ? std::string()
           : base::UTF16ToUTF8(manifest.gcm_sender_id.string()),
-      user_visible, service_worker_registration_id));
+      options.userVisibleOnly, service_worker_registration_id));
 }
 
 void PushMessagingDispatcher::OnSubscribeFromDocumentSuccess(
     int32_t request_id,
     const GURL& endpoint,
     const std::string& subscription_id) {
   blink::WebPushSubscriptionCallbacks* callbacks =
       subscription_callbacks_.Lookup(request_id);
   DCHECK(callbacks);
 
@@ skipping 15 matching lines @@
 
   scoped_ptr<blink::WebPushError> error(new blink::WebPushError(
       blink::WebPushError::ErrorTypeAbort,
       WebString::fromUTF8(PushRegistrationStatusToString(status))));
   callbacks->onError(error.release());
 
   subscription_callbacks_.Remove(request_id);
 }
 
 }  // namespace content