[webcrypto] Remove ifdefs for whether hmac key algorithm has length.

content/child/webcrypto/shared_crypto_unittest.cc

Index: content/child/webcrypto/shared_crypto_unittest.cc
diff --git a/content/child/webcrypto/shared_crypto_unittest.cc b/content/child/webcrypto/shared_crypto_unittest.cc
index 814a26fb45ff31d140754e9e2ac4a3504cf9fdab..bb6eb64b6843f3e5533a705d83b7f71c7de56fe6 100644
--- a/content/child/webcrypto/shared_crypto_unittest.cc
+++ b/content/child/webcrypto/shared_crypto_unittest.cc
@@ -675,9 +675,7 @@ TEST_F(SharedCryptoTest, HMACSampleSets) {
         blink::WebCryptoKeyUsageSign | blink::WebCryptoKeyUsageVerify);
 
     EXPECT_EQ(test_hash.id(), key.algorithm().hmacParams()->hash().id());
-#if defined(WEBCRYPTO_HMAC_KEY_HAS_LENGTH)
     EXPECT_EQ(test_key.size() * 8, key.algorithm().hmacParams()->lengthBits());
-#endif
 
     // Verify exported raw key is identical to the imported data
     blink::WebArrayBuffer raw_key;
@@ -958,9 +956,7 @@ TEST_F(SharedCryptoTest, MAYBE(GenerateKeyHmac)) {
     EXPECT_EQ(blink::WebCryptoAlgorithmIdHmac, key.algorithm().id());
     EXPECT_EQ(blink::WebCryptoAlgorithmIdSha1,
               key.algorithm().hmacParams()->hash().id());
-#if defined(WEBCRYPTO_HMAC_KEY_HAS_LENGTH)
     EXPECT_EQ(512u, key.algorithm().hmacParams()->lengthBits());
-#endif
 
     blink::WebArrayBuffer raw_key;
     ASSERT_STATUS_SUCCESS(
@@ -984,9 +980,7 @@ TEST_F(SharedCryptoTest, MAYBE(GenerateKeyHmacNoLength)) {
   EXPECT_EQ(blink::WebCryptoAlgorithmIdHmac, key.algorithm().id());
   EXPECT_EQ(blink::WebCryptoAlgorithmIdSha1,
             key.algorithm().hmacParams()->hash().id());
-#if defined(WEBCRYPTO_HMAC_KEY_HAS_LENGTH)
-    EXPECT_EQ(512u, key.algorithm().hmacParams()->lengthBits());
-#endif
+  EXPECT_EQ(512u, key.algorithm().hmacParams()->lengthBits());
   blink::WebArrayBuffer raw_key;
   ASSERT_STATUS_SUCCESS(ExportKey(blink::WebCryptoKeyFormatRaw, key, &raw_key));
   EXPECT_EQ(64U, raw_key.byteLength());
@@ -997,9 +991,7 @@ TEST_F(SharedCryptoTest, MAYBE(GenerateKeyHmacNoLength)) {
   EXPECT_EQ(blink::WebCryptoAlgorithmIdHmac, key.algorithm().id());
   EXPECT_EQ(blink::WebCryptoAlgorithmIdSha512,
             key.algorithm().hmacParams()->hash().id());
-#if defined(WEBCRYPTO_HMAC_KEY_HAS_LENGTH)
-    EXPECT_EQ(1024u, key.algorithm().hmacParams()->lengthBits());
-#endif
+  EXPECT_EQ(1024u, key.algorithm().hmacParams()->lengthBits());
   ASSERT_STATUS_SUCCESS(ExportKey(blink::WebCryptoKeyFormatRaw, key, &raw_key));
   EXPECT_EQ(128U, raw_key.byteLength());
 }
@@ -1376,9 +1368,7 @@ TEST_F(SharedCryptoTest, MAYBE(ImportJwkInputConsistency)) {
   EXPECT_EQ(blink::WebCryptoAlgorithmIdHmac, key.algorithm().id());
   EXPECT_EQ(blink::WebCryptoAlgorithmIdSha256,
             key.algorithm().hmacParams()->hash().id());
-#if defined(WEBCRYPTO_HMAC_KEY_HAS_LENGTH)
-    EXPECT_EQ(320u, key.algorithm().hmacParams()->lengthBits());
-#endif
+  EXPECT_EQ(320u, key.algorithm().hmacParams()->lengthBits());
   EXPECT_EQ(blink::WebCryptoKeyUsageVerify, key.usages());
   key = blink::WebCryptoKey::createNull();
 
@@ -2637,9 +2627,7 @@ TEST_F(SharedCryptoTest, MAYBE(AesKwJwkSymkeyUnwrapKnownData)) {
   EXPECT_EQ(blink::WebCryptoAlgorithmIdHmac, unwrapped_key.algorithm().id());
   EXPECT_EQ(blink::WebCryptoAlgorithmIdSha256,
             unwrapped_key.algorithm().hmacParams()->hash().id());
-#if defined(WEBCRYPTO_HMAC_KEY_HAS_LENGTH)
   EXPECT_EQ(256u, unwrapped_key.algorithm().hmacParams()->lengthBits());
-#endif
   EXPECT_EQ(true, unwrapped_key.extractable());
   EXPECT_EQ(blink::WebCryptoKeyUsageVerify, unwrapped_key.usages());