Fixes for re-enabling more MSVC level 4 warnings: content/ edition

content/child/webcrypto/shared_crypto.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 "content/child/webcrypto/shared_crypto.h"
 
 #include "base/logging.h"
 #include "content/child/webcrypto/crypto_data.h"
 #include "content/child/webcrypto/jwk.h"
 #include "content/child/webcrypto/platform_crypto.h"
@@ skipping 466 matching lines @@
 // Returns Status::Success() if |usages| is a valid set of key usages for
 // |algorithm| and |key_type|. Otherwise returns an error.
 // In the case of JWK format the check is incomplete for asymmetric algorithms.
 Status BestEffortCheckKeyUsagesForImport(blink::WebCryptoAlgorithmId algorithm,
                                          blink::WebCryptoKeyFormat format,
                                          blink::WebCryptoKeyUsageMask usages) {
   if (!IsAlgorithmAsymmetric(algorithm))
     return CheckKeyUsages(algorithm, blink::WebCryptoKeyTypeSecret, usages);
 
   // Try to infer the key type given the import format.
-  blink::WebCryptoKeyType key_type;
-  bool key_type_known = false;
-
   switch (format) {
     case blink::WebCryptoKeyFormatRaw:
       // TODO(eroman): The spec defines Diffie-Hellman raw import for public
       // keys, so this will need to be updated in the future when DH is
       // implemented.
       return Status::ErrorUnexpected();
     case blink::WebCryptoKeyFormatSpki:
-      key_type = blink::WebCryptoKeyTypePublic;
-      key_type_known = true;
-      break;
+      return CheckKeyUsages(algorithm, blink::WebCryptoKeyTypePublic, usages);
     case blink::WebCryptoKeyFormatPkcs8:
-      key_type = blink::WebCryptoKeyTypePrivate;
-      key_type_known = true;
-      break;
+      return CheckKeyUsages(algorithm, blink::WebCryptoKeyTypePrivate, usages);
     case blink::WebCryptoKeyFormatJwk:
-      key_type_known = false;
       break;
     default:
       return Status::ErrorUnexpected();
   }
 
-  if (key_type_known)
-    return CheckKeyUsages(algorithm, key_type, usages);
-
   // If the key type is not known, then the algorithm is asymmetric. Whether the
   // key data describes a public or private key isn't known yet. But it must at
   // least be ONE of those two.
   DCHECK(IsAlgorithmAsymmetric(algorithm));
 
   if (CheckKeyUsages(algorithm, blink::WebCryptoKeyTypePublic, usages)
           .IsError() &&
       CheckKeyUsages(algorithm, blink::WebCryptoKeyTypePrivate, usages)
           .IsError()) {
     return Status::ErrorCreateKeyBadUsages();
@@ skipping 422 matching lines @@
   if (!ContainsKeyUsages(GetValidKeyUsagesForKeyType(algorithm, key_type),
                          usages))
     return Status::ErrorCreateKeyBadUsages();
 
   return Status::Success();
 }
 
 }  // namespace webcrypto
 
 }  // namespace content