Push API: Remove AddAppHandlerIfNecessary to prevent DCHECK

chrome/browser/services/gcm/push_messaging_service_impl.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 "chrome/browser/services/gcm/push_messaging_service_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 229 matching lines @@
       requesting_origin, service_worker_registration_id);
   DCHECK(application_id.IsValid());
 
   if (push_registration_count_ >= kMaxRegistrations) {
     RegisterEnd(callback,
                 std::string(),
                 content::PUSH_REGISTRATION_STATUS_LIMIT_REACHED);
     return;
   }
 
-  // TODO(johnme): This is probably redundant due to
-  // https://codereview.chromium.org/756063002, or even if it isn't it'll
-  // interfere with auto-removing the app handler, so should be removed.
-  // If this is registering for the first time then the driver does not have
-  // this as an app handler and registration would fail.
-  AddAppHandlerIfNecessary();
-
   content::RenderFrameHost* render_frame_host =
       content::RenderFrameHost::FromID(renderer_id, render_frame_id);
   if (!render_frame_host)
     return;
 
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
   if (!web_contents)
     return;
 
@@ skipping 41 matching lines @@
       requesting_origin, service_worker_registration_id);
   DCHECK(application_id.IsValid());
 
   if (profile_->GetPrefs()->GetInteger(
           prefs::kPushMessagingRegistrationCount) >= kMaxRegistrations) {
     RegisterEnd(register_callback, std::string(),
                 content::PUSH_REGISTRATION_STATUS_LIMIT_REACHED);
     return;
   }
 
-  // If this is registering for the first time then the driver does not have
-  // this as an app handler and registration would fail.
-  AddAppHandlerIfNecessary();
-
   GURL embedding_origin = requesting_origin;
   blink::WebPushPermissionStatus permission_status =
       PushMessagingServiceImpl::GetPermissionStatus(requesting_origin,
                                                     embedding_origin);
   if (permission_status != blink::WebPushPermissionStatusGranted) {
     RegisterEnd(register_callback, std::string(),
                 content::PUSH_REGISTRATION_STATUS_PERMISSION_DENIED);
     return;
   }
 
@@ skipping 117 matching lines @@
 
 bool PushMessagingServiceImpl::HasPermission(const GURL& origin) {
   gcm::PushMessagingPermissionContext* permission_context =
       gcm::PushMessagingPermissionContextFactory::GetForProfile(profile_);
   DCHECK(permission_context);
 
   return permission_context->GetPermissionStatus(origin, origin) ==
       CONTENT_SETTING_ALLOW;
 }
 
-void PushMessagingServiceImpl::AddAppHandlerIfNecessary() {
-  if (gcm_profile_service_->driver()->GetAppHandler(
-          kPushMessagingApplicationIdPrefix) != this)
-    gcm_profile_service_->driver()->AddAppHandler(
-        kPushMessagingApplicationIdPrefix, this);
-}
-
 }  // namespace gcm