Remove GCMMessageCryptographer::Label

components/gcm_driver/crypto/gcm_message_cryptographer.h

 // 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.
 
 #ifndef COMPONENTS_GCM_DRIVER_CRYPTO_GCM_MESSAGE_CRYPTOGRAPHER_H_
 #define COMPONENTS_GCM_DRIVER_CRYPTO_GCM_MESSAGE_CRYPTOGRAPHER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string>
@@ skipping 19 matching lines @@
 // Note that while this class is not responsible for creating or storing the
 // actual keys, it uses a key derivation function for the actual message
 // encryption/decryption, thus allowing for the safe re-use of keys in multiple
 // messages provided that a cryptographically-strong random salt is used.
 class GCMMessageCryptographer {
  public:
   // Salt size, in bytes, that will be used together with the key to create a
   // unique content encryption key for a given message.
   static const size_t kSaltSize;
 
-  // Label of the encryption group used to calculate the shared secret.
-  enum class Label {
-    P256
-  };
-
-  // Creates a new cryptographer with |label|, identifying the group used for
-  // the key agreement, and the public keys of both the recipient and sender.
-  GCMMessageCryptographer(Label label,
-                          const base::StringPiece& recipient_public_key,
+  // Creates a new cryptographer, identifying the group used forthe key

[johnme, 2017/01/10 18:10:52]

s/forthe/for the/

[Peter Beverloo, 2017/01/10 18:11:52]

Done.

+  // agreement, and the public keys of both the recipient and sender.
+  GCMMessageCryptographer(const base::StringPiece& recipient_public_key,
                           const base::StringPiece& sender_public_key,
                           const std::string& auth_secret);
 
   ~GCMMessageCryptographer();
 
   // Encrypts |plaintext| using the |ikm| and the |salt|, both of which must be
   // 16 octets in length. The |plaintext| will be written to a single record,
   // and will include a 16 octet authentication tag. The encrypted result will
   // be written to |ciphertext|, the record size to |record_size|. This
   // implementation does not support prepending padding to the |plaintext|.
@@ skipping 58 matching lines @@
   bool allow_empty_auth_secret_for_tests_ = false;
 
   void set_allow_empty_auth_secret_for_tests(bool value) {
     allow_empty_auth_secret_for_tests_ = value;
   }
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_CRYPTO_GCM_MESSAGE_CRYPTOGRAPHER_H_