Separate out the scheme from the GCMMessageCryptographer

components/gcm_driver/crypto/gcm_crypto_test_helpers.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_crypto_test_helpers.h"
 
 #include <stddef.h>
 
 #include <sstream>
 #include <string>
@@ skipping 26 matching lines @@
                                &shared_secret)) {
     return false;
   }
 
   std::string salt;
 
   // Generate a cryptographically secure random salt for the message.
   const size_t salt_size = GCMMessageCryptographer::kSaltSize;
   crypto::RandBytes(base::WriteInto(&salt, salt_size + 1), salt_size);
 
-  GCMMessageCryptographer cryptographer(peer_public_key, public_key,
-                                        auth_secret.as_string());
+  GCMMessageCryptographer cryptographer(
+      GCMMessageCryptographer::Version::DRAFT_03);
 
   size_t record_size;
   std::string ciphertext;
 
-  if (!cryptographer.Encrypt(payload, shared_secret, salt, &record_size,
+  if (!cryptographer.Encrypt(peer_public_key, public_key, shared_secret,
+                             auth_secret, salt, payload, &record_size,
                              &ciphertext)) {
     return false;
   }
 
   std::string encoded_salt, encoded_public_key;
 
   // Create base64url encoded representations of the salt and local public key.
   base::Base64UrlEncode(salt, base::Base64UrlEncodePolicy::OMIT_PADDING,
                         &encoded_salt);
   base::Base64UrlEncode(public_key, base::Base64UrlEncodePolicy::OMIT_PADDING,
                         &encoded_public_key);
 
   // Write the Encryption header value to |*message|.
   std::stringstream encryption_header;
   encryption_header << "salt=" << encoded_salt << ";rs=" << record_size;
 
   message->data["encryption"] = encryption_header.str();
 
   // Write the Crypto-Key value to |*message|.
   std::stringstream crypto_key_header;
   crypto_key_header << "dh=" << encoded_public_key;
 
   message->data["crypto-key"] = crypto_key_header.str();
 
   message->raw_data.swap(ciphertext);
   return true;
 }
 
 }  // namespace gcm