Cleanup: rename usage_mask --> usages.

content/child/webcrypto/nss/hmac_nss.cc

 // Copyright 2014 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 <cryptohi.h>
 #include <pk11pub.h>
 #include <secerr.h>
 #include <sechash.h>
 
 #include "base/logging.h"
@@ skipping 39 matching lines @@
       return false;
   }
 }
 
 class HmacImplementation : public AlgorithmImplementation {
  public:
   HmacImplementation() {}
 
   virtual Status GenerateKey(const blink::WebCryptoAlgorithm& algorithm,
                              bool extractable,
-                             blink::WebCryptoKeyUsageMask usage_mask,
+                             blink::WebCryptoKeyUsageMask usages,
                              GenerateKeyResult* result) const override {
-    Status status = CheckKeyCreationUsages(kAllKeyUsages, usage_mask);
+    Status status = CheckKeyCreationUsages(kAllKeyUsages, usages);
     if (status.IsError())
       return status;
 
     const blink::WebCryptoHmacKeyGenParams* params =
         algorithm.hmacKeyGenParams();
 
     const blink::WebCryptoAlgorithm& hash = params->hash();
     CK_MECHANISM_TYPE mechanism = CKM_INVALID_MECHANISM;
     if (!WebCryptoHashToHMACMechanism(hash, &mechanism))
       return Status::ErrorUnsupported();
 
     unsigned int keylen_bits = 0;
     status = GetHmacKeyGenLengthInBits(params, &keylen_bits);
     if (status.IsError())
       return status;
 
     return GenerateSecretKeyNss(
         blink::WebCryptoKeyAlgorithm::createHmac(hash.id(), keylen_bits),
         extractable,
-        usage_mask,
+        usages,
         keylen_bits / 8,
         mechanism,
         result);
   }
 
   virtual Status VerifyKeyUsagesBeforeImportKey(
       blink::WebCryptoKeyFormat format,
-      blink::WebCryptoKeyUsageMask usage_mask) const override {
+      blink::WebCryptoKeyUsageMask usages) const override {
     switch (format) {
       case blink::WebCryptoKeyFormatRaw:
       case blink::WebCryptoKeyFormatJwk:
-        return CheckKeyCreationUsages(kAllKeyUsages, usage_mask);
+        return CheckKeyCreationUsages(kAllKeyUsages, usages);
       default:
         return Status::ErrorUnsupportedImportKeyFormat();
     }
   }
 
   virtual Status ImportKeyRaw(const CryptoData& key_data,
                               const blink::WebCryptoAlgorithm& algorithm,
                               bool extractable,
-                              blink::WebCryptoKeyUsageMask usage_mask,
+                              blink::WebCryptoKeyUsageMask usages,
                               blink::WebCryptoKey* key) const override {
     const blink::WebCryptoAlgorithm& hash =
         algorithm.hmacImportParams()->hash();
 
     CK_MECHANISM_TYPE mechanism = CKM_INVALID_MECHANISM;
     if (!WebCryptoHashToHMACMechanism(hash, &mechanism))
       return Status::ErrorUnsupported();
 
     base::CheckedNumeric<unsigned int> keylen_bits(key_data.byte_length());
     keylen_bits *= 8;
 
     if (!keylen_bits.IsValid())
       return Status::ErrorDataTooLarge();
 
     return ImportKeyRawNss(key_data,
                            blink::WebCryptoKeyAlgorithm::createHmac(
                                hash.id(), keylen_bits.ValueOrDie()),
                            extractable,
-                           usage_mask,
+                           usages,
                            mechanism,
                            CKF_SIGN | CKF_VERIFY,
                            key);
   }
 
   virtual Status ImportKeyJwk(const CryptoData& key_data,
                               const blink::WebCryptoAlgorithm& algorithm,
                               bool extractable,
-                              blink::WebCryptoKeyUsageMask usage_mask,
+                              blink::WebCryptoKeyUsageMask usages,
                               blink::WebCryptoKey* key) const override {
     const char* algorithm_name =
         GetJwkHmacAlgorithmName(algorithm.hmacImportParams()->hash().id());
     if (!algorithm_name)
       return Status::ErrorUnexpected();
 
     std::vector<uint8_t> raw_data;
     Status status = ReadSecretKeyJwk(
-        key_data, algorithm_name, extractable, usage_mask, &raw_data);
+        key_data, algorithm_name, extractable, usages, &raw_data);
     if (status.IsError())
       return status;
 
     return ImportKeyRaw(
-        CryptoData(raw_data), algorithm, extractable, usage_mask, key);
+        CryptoData(raw_data), algorithm, extractable, usages, key);
   }
 
   virtual Status ExportKeyRaw(const blink::WebCryptoKey& key,
                               std::vector<uint8_t>* buffer) const override {
     *buffer = SymKeyNss::Cast(key)->raw_key_data();
     return Status::Success();
   }
 
   virtual Status ExportKeyJwk(const blink::WebCryptoKey& key,
                               std::vector<uint8_t>* buffer) const override {
@@ skipping 75 matching lines @@
 
 }  // namespace
 
 AlgorithmImplementation* CreatePlatformHmacImplementation() {
   return new HmacImplementation;
 }
 
 }  // namespace webcrypto
 
 }  // namespace content