Separate out the scheme from the GCMMessageCryptographer

components/gcm_driver/crypto/gcm_encryption_provider_unittest.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 <stddef.h>
 
 #include <sstream>
 #include <string>
@@ skipping 478 matching lines @@
       &shared_secret));
 
   IncomingMessage message;
   size_t record_size;
 
   message.sender_id = kExampleAuthorizedEntity;
 
   // Encrypts the |kExampleMessage| using the generated shared key and the
   // random |salt|, storing the result in |record_size| and the message.
   GCMMessageCryptographer cryptographer(
-      pair.public_key(), server_pair.public_key(), auth_secret);
+      GCMMessageCryptographer::Version::DRAFT_03);
 
-  ASSERT_TRUE(cryptographer.Encrypt(kExampleMessage, shared_secret, salt,
-                                    &record_size, &message.raw_data));
+  ASSERT_TRUE(cryptographer.Encrypt(
+      pair.public_key(), server_pair.public_key(), shared_secret, auth_secret,
+      salt, kExampleMessage, &record_size, &message.raw_data));
 
   std::string encoded_salt, encoded_key;
 
   // Compile the incoming GCM message, including the required headers.
   base::Base64UrlEncode(
       salt, base::Base64UrlEncodePolicy::INCLUDE_PADDING, &encoded_salt);
   base::Base64UrlEncode(
       server_pair.public_key(), base::Base64UrlEncodePolicy::INCLUDE_PADDING,
       &encoded_key);
 
@@ skipping 23 matching lines @@
 }
 
 TEST_F(GCMEncryptionProviderTest, EncryptionRoundTripInstanceIDToken) {
   // GCMEncryptionProvider::DecryptMessage should succeed when the message was
   // sent to an InstanceID token (non-empty authorized_entity).
   ASSERT_NO_FATAL_FAILURE(
       TestEncryptionRoundTrip(kExampleAppId, kExampleAuthorizedEntity));
 }
 
 }  // namespace gcm