Separate out the scheme from the GCMMessageCryptographer

components/gcm_driver/crypto/gcm_encryption_provider_unittest.cc

Index: components/gcm_driver/crypto/gcm_encryption_provider_unittest.cc
diff --git a/components/gcm_driver/crypto/gcm_encryption_provider_unittest.cc b/components/gcm_driver/crypto/gcm_encryption_provider_unittest.cc
index 43184e274cb2c12daa9da94e1eb74e8406ea5672..15ff1aeacd0dc9354672bcebe1d2f338ee8b5790 100644
--- a/components/gcm_driver/crypto/gcm_encryption_provider_unittest.cc
+++ b/components/gcm_driver/crypto/gcm_encryption_provider_unittest.cc
@@ -496,10 +496,11 @@ void GCMEncryptionProviderTest::TestEncryptionRoundTrip(
   // 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;