[webcrypto] Remove support for null import algorithms.

content/child/webcrypto/shared_crypto.h

 // 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.
 
 #ifndef CONTENT_CHILD_WEBCRYPTO_SHARED_CRYPTO_H_
 #define CONTENT_CHILD_WEBCRYPTO_SHARED_CRYPTO_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "content/common/content_export.h"
@@ skipping 82 matching lines @@
                       blink::WebCryptoKeyUsageMask usage_mask,
                       blink::WebCryptoKey* key);
 
 CONTENT_EXPORT Status
     GenerateKeyPair(const blink::WebCryptoAlgorithm& algorithm,
                     bool extractable,
                     blink::WebCryptoKeyUsageMask usage_mask,
                     blink::WebCryptoKey* public_key,
                     blink::WebCryptoKey* private_key);
 
-CONTENT_EXPORT Status
-    ImportKey(blink::WebCryptoKeyFormat format,
-              const CryptoData& key_data,
-              const blink::WebCryptoAlgorithm& algorithm_or_null,
-              bool extractable,
-              blink::WebCryptoKeyUsageMask usage_mask,
-              blink::WebCryptoKey* key);
+CONTENT_EXPORT Status ImportKey(blink::WebCryptoKeyFormat format,
+                                const CryptoData& key_data,
+                                const blink::WebCryptoAlgorithm& algorithm,
+                                bool extractable,
+                                blink::WebCryptoKeyUsageMask usage_mask,
+                                blink::WebCryptoKey* key);
 
 CONTENT_EXPORT Status ExportKey(blink::WebCryptoKeyFormat format,
                                 const blink::WebCryptoKey& key,
                                 blink::WebArrayBuffer* buffer);
 
 CONTENT_EXPORT Status Sign(const blink::WebCryptoAlgorithm& algorithm,
                            const blink::WebCryptoKey& key,
                            const CryptoData& data,
                            blink::WebArrayBuffer* buffer);
 
 CONTENT_EXPORT Status
     VerifySignature(const blink::WebCryptoAlgorithm& algorithm,
                     const blink::WebCryptoKey& key,
                     const CryptoData& signature,
                     const CryptoData& data,
                     bool* signature_match);
 
-CONTENT_EXPORT Status
-    ImportKeyJwk(const CryptoData& key_data,
-                 const blink::WebCryptoAlgorithm& algorithm_or_null,
-                 bool extractable,
-                 blink::WebCryptoKeyUsageMask usage_mask,
-                 blink::WebCryptoKey* key);
+CONTENT_EXPORT Status ImportKeyJwk(const CryptoData& key_data,
+                                   const blink::WebCryptoAlgorithm& algorithm,
+                                   bool extractable,
+                                   blink::WebCryptoKeyUsageMask usage_mask,
+                                   blink::WebCryptoKey* key);
 
 CONTENT_EXPORT Status
     ExportKeyJwk(const blink::WebCryptoKey& key, blink::WebArrayBuffer* buffer);
 
 CONTENT_EXPORT Status
     WrapKey(blink::WebCryptoKeyFormat format,
             const blink::WebCryptoKey& wrapping_key,
             const blink::WebCryptoKey& key_to_wrap,
             const blink::WebCryptoAlgorithm& wrapping_algorithm,
             blink::WebArrayBuffer* buffer);
 
 CONTENT_EXPORT Status
     UnwrapKey(blink::WebCryptoKeyFormat format,
               const CryptoData& wrapped_key_data,
               const blink::WebCryptoKey& wrapping_key,
               const blink::WebCryptoAlgorithm& wrapping_algorithm,
-              const blink::WebCryptoAlgorithm& algorithm_or_null,
+              const blink::WebCryptoAlgorithm& algorithm,
               bool extractable,
               blink::WebCryptoKeyUsageMask usage_mask,
               blink::WebCryptoKey* key);
 
 CONTENT_EXPORT Status
     SerializeKeyForClone(const blink::WebCryptoKey& key,
                          blink::WebVector<unsigned char>* data);
 
 CONTENT_EXPORT Status
     DeserializeKeyForClone(const blink::WebCryptoKeyAlgorithm& algorithm,
                            blink::WebCryptoKeyType type,
                            bool extractable,
                            blink::WebCryptoKeyUsageMask usage_mask,
                            const CryptoData& key_data,
                            blink::WebCryptoKey* key);
 
 }  // namespace webcrypto
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_WEBCRYPTO_SHARED_CRYPTO_H_