Disallow repeated PushManager.subscribes with different sender ids

content/public/common/push_messaging_status.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/public/common/push_messaging_status.h"
 
 #include "base/logging.h"
 
 namespace content {
 
@@ skipping 34 matching lines @@
       // We split this out for UMA, but it must be indistinguishable to JS.
       return PushRegistrationStatusToString(
           PUSH_REGISTRATION_STATUS_PERMISSION_DENIED);
 
     case PUSH_REGISTRATION_STATUS_PUBLIC_KEY_UNAVAILABLE:
       return "Registration failed - could not retrieve the public key";
 
     case PUSH_REGISTRATION_STATUS_MANIFEST_EMPTY_OR_MISSING:
       return "Registration failed - missing applicationServerKey, and manifest "
              "empty or missing";
+
+    case PUSH_REGISTRATION_STATUS_SENDER_ID_MISMATCH:
+      return "Registration failed - A subscription with a different sender ID "

[johnme, 2016/11/08 13:39:55]

Let's be explicit. How about "A subscription with a different
applicationServerKey (or gcm_sender_id) already exists; to change the
applicationServerKey, unsubscribe then resubscribe"

[awdf, 2016/11/08 14:39:16]

ok - how about "Registration failed - A subscription with a different
applicationServerKey (or gcm_sender_id) already exists; to change the
applicationServerKey, unsubscribe before calling subscribe() again."?

+             "already exists";
   }
   NOTREACHED();
   return "";
 }
 
 const char* PushUnregistrationStatusToString(PushUnregistrationStatus status) {
   switch (status) {
     case PUSH_UNREGISTRATION_STATUS_SUCCESS_UNREGISTERED:
       return "Unregistration successful - from push service";
 
@@ skipping 18 matching lines @@
       return "Unregistration failed - storage error";
 
     case PUSH_UNREGISTRATION_STATUS_NETWORK_ERROR:
       return "Unregistration failed - could not connect to push server";
   }
   NOTREACHED();
   return "";
 }
 
 }  // namespace content