Enable support for draft-ietf-webpush-encryption-08

components/gcm_driver/gcm_driver.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 "components/gcm_driver/gcm_driver.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 270 matching lines @@
 
 void GCMDriver::DispatchMessageInternal(
     const std::string& app_id,
     GCMEncryptionProvider::DecryptionResult result,
     const IncomingMessage& message) {
   UMA_HISTOGRAM_ENUMERATION("GCM.Crypto.DecryptMessageResult", result,
                             GCMEncryptionProvider::DECRYPTION_RESULT_LAST + 1);
 
   switch (result) {
     case GCMEncryptionProvider::DECRYPTION_RESULT_UNENCRYPTED:
-    case GCMEncryptionProvider::DECRYPTION_RESULT_DECRYPTED: {
+    case GCMEncryptionProvider::DECRYPTION_RESULT_DECRYPTED_DRAFT_03:
+    case GCMEncryptionProvider::DECRYPTION_RESULT_DECRYPTED_DRAFT_08: {
       GCMAppHandler* handler = GetAppHandler(app_id);
       if (handler)
         handler->OnMessage(app_id, message);
 
       // TODO(peter/harkness): Surface unavailable app handlers on
       // chrome://gcm-internals and send a delivery receipt.
       return;
     }
     case GCMEncryptionProvider::DECRYPTION_RESULT_INVALID_ENCRYPTION_HEADER:
     case GCMEncryptionProvider::DECRYPTION_RESULT_INVALID_CRYPTO_KEY_HEADER:
     case GCMEncryptionProvider::DECRYPTION_RESULT_NO_KEYS:
     case GCMEncryptionProvider::DECRYPTION_RESULT_INVALID_SHARED_SECRET:
     case GCMEncryptionProvider::DECRYPTION_RESULT_INVALID_PAYLOAD:
+    case GCMEncryptionProvider::DECRYPTION_RESULT_INVALID_BINARY_HEADER:
       RecordDecryptionFailure(app_id, result);
       return;
   }
 
   NOTREACHED();
 }
 
 void GCMDriver::RegisterAfterUnregister(
     const std::string& app_id,
     const std::vector<std::string>& normalized_sender_ids,
     const UnregisterCallback& unregister_callback,
     GCMClient::Result result) {
   // Invoke the original unregister callback.
   unregister_callback.Run(result);
 
   // Trigger the pending registration.
   DCHECK(register_callbacks_.find(app_id) != register_callbacks_.end());
   RegisterImpl(app_id, normalized_sender_ids);
 }
 
 }  // namespace gcm