Separate out the scheme from the GCMMessageCryptographer

components/gcm_driver/crypto/gcm_encryption_provider.cc

 // Copyright 2015 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/crypto/gcm_encryption_provider.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 229 matching lines @@
   std::string shared_secret;
   if (!ComputeSharedP256Secret(pair.private_key(), pair.public_key_x509(), dh,
                                &shared_secret)) {
     DLOG(ERROR) << "Unable to calculate the shared secret.";
     callback.Run(DECRYPTION_RESULT_INVALID_SHARED_SECRET, IncomingMessage());
     return;
   }
 
   std::string plaintext;
 
-  GCMMessageCryptographer cryptographer(pair.public_key(), dh, auth_secret);
-  if (!cryptographer.Decrypt(message.raw_data, shared_secret, salt, rs,
-                             &plaintext)) {
+  GCMMessageCryptographer cryptographer(
+      GCMMessageCryptographer::Version::DRAFT_03);
+
+  if (!cryptographer.Decrypt(pair.public_key(), dh, shared_secret, auth_secret,
+                             salt, message.raw_data, rs, &plaintext)) {
     DLOG(ERROR) << "Unable to decrypt the incoming data.";
     callback.Run(DECRYPTION_RESULT_INVALID_PAYLOAD, IncomingMessage());
     return;
   }
 
   IncomingMessage decrypted_message;
   decrypted_message.collapse_key = message.collapse_key;
   decrypted_message.sender_id = message.sender_id;
   decrypted_message.raw_data.swap(plaintext);
   decrypted_message.decrypted = true;
 
   // There must be no data associated with the decrypted message at this point,
   // to make sure that we don't end up in an infinite decryption loop.
   DCHECK_EQ(0u, decrypted_message.data.size());
 
   callback.Run(DECRYPTION_RESULT_DECRYPTED, decrypted_message);
 }
 
 }  // namespace gcm