[webcrypto] Remove support for null import algorithms.

content/child/webcrypto/webcrypto_impl.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/webcrypto_impl.h"
 
 #include "base/logging.h"
 #include "content/child/webcrypto/crypto_data.h"
 #include "content/child/webcrypto/shared_crypto.h"
 #include "content/child/webcrypto/status.h"
@@ skipping 105 matching lines @@
     } else {
       DCHECK(key.handle());
       DCHECK_EQ(algorithm.id(), key.algorithm().id());
       DCHECK_EQ(extractable, key.extractable());
       DCHECK_EQ(usage_mask, key.usages());
       result.completeWithKey(key);
     }
   }
 }
 
-void WebCryptoImpl::importKey(
-    blink::WebCryptoKeyFormat format,
-    const unsigned char* key_data,
-    unsigned int key_data_size,
-    const blink::WebCryptoAlgorithm& algorithm_or_null,
-    bool extractable,
-    blink::WebCryptoKeyUsageMask usage_mask,
-    blink::WebCryptoResult result) {
+void WebCryptoImpl::importKey(blink::WebCryptoKeyFormat format,
+                              const unsigned char* key_data,
+                              unsigned int key_data_size,
+                              const blink::WebCryptoAlgorithm& algorithm,
+                              bool extractable,
+                              blink::WebCryptoKeyUsageMask usage_mask,
+                              blink::WebCryptoResult result) {
   blink::WebCryptoKey key = blink::WebCryptoKey::createNull();
   Status status =
       webcrypto::ImportKey(format,
                            webcrypto::CryptoData(key_data, key_data_size),
-                           algorithm_or_null,
+                           algorithm,
                            extractable,
                            usage_mask,
                            &key);
   if (status.IsError()) {
     CompleteWithError(status, &result);
   } else {
     DCHECK(key.handle());
     DCHECK(!key.algorithm().isNull());
     DCHECK_EQ(extractable, key.extractable());
     result.completeWithKey(key);
@@ skipping 78 matching lines @@
 }
 
 bool WebCryptoImpl::serializeKeyForClone(
     const blink::WebCryptoKey& key,
     blink::WebVector<unsigned char>& key_data) {
   Status status = webcrypto::SerializeKeyForClone(key, &key_data);
   return status.IsSuccess();
 }
 
 }  // namespace content