Revert "Implement chrome.platformKeys.getKeyPair()."

chrome/renderer/extensions/platform_keys_natives.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 "chrome/renderer/extensions/platform_keys_natives.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
 #include "content/public/child/v8_value_converter.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebCryptoNormalize.h"
 
 namespace extensions {
 
 namespace {
 
 bool StringToWebCryptoOperation(const std::string& str,
                                 blink::WebCryptoOperation* op) {
   if (str == "GenerateKey") {
     *op = blink::WebCryptoOperationGenerateKey;
     return true;
   }
-  if (str == "ImportKey") {
-    *op = blink::WebCryptoOperationImportKey;
-    return true;
-  }
   if (str == "Sign") {
     *op = blink::WebCryptoOperationSign;
     return true;
   }
   if (str == "Verify") {
     *op = blink::WebCryptoOperationVerify;
     return true;
   }
   return false;
 }
 
 scoped_ptr<base::DictionaryValue> WebCryptoAlgorithmToBaseValue(
     const blink::WebCryptoAlgorithm& algorithm) {
   DCHECK(!algorithm.isNull());
 
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
   const blink::WebCryptoAlgorithmInfo* info =
       blink::WebCryptoAlgorithm::lookupAlgorithmInfo(algorithm.id());
   dict->SetStringWithoutPathExpansion("name", info->name);
-
-  const blink::WebCryptoAlgorithm* hash = nullptr;
-
   const blink::WebCryptoRsaHashedKeyGenParams* rsaHashedKeyGen =
       algorithm.rsaHashedKeyGenParams();
   if (rsaHashedKeyGen) {
     dict->SetIntegerWithoutPathExpansion("modulusLength",
                                          rsaHashedKeyGen->modulusLengthBits());
     const blink::WebVector<unsigned char>& public_exponent =
         rsaHashedKeyGen->publicExponent();
     dict->SetWithoutPathExpansion(
         "publicExponent",
         base::BinaryValue::CreateWithCopiedBuffer(
             reinterpret_cast<const char*>(public_exponent.data()),
             public_exponent.size()));
 
-    hash = &rsaHashedKeyGen->hash();
-    DCHECK(!hash->isNull());
-  }
-
-  const blink::WebCryptoRsaHashedImportParams* rsaHashedImport =
-      algorithm.rsaHashedImportParams();
-  if (rsaHashedImport) {
-    hash = &rsaHashedImport->hash();
-    DCHECK(!hash->isNull());
-  }
-
-  if (hash) {
+    const blink::WebCryptoAlgorithm& hash = rsaHashedKeyGen->hash();
+    DCHECK(!hash.isNull());
     const blink::WebCryptoAlgorithmInfo* hash_info =
-        blink::WebCryptoAlgorithm::lookupAlgorithmInfo(hash->id());
+        blink::WebCryptoAlgorithm::lookupAlgorithmInfo(hash.id());
 
     scoped_ptr<base::DictionaryValue> hash_dict(new base::DictionaryValue);
     hash_dict->SetStringWithoutPathExpansion("name", hash_info->name);
     dict->SetWithoutPathExpansion("hash", hash_dict.release());
   }
   // Otherwise, |algorithm| is missing support here or no parameters were
   // required.
   return dict.Pass();
 }
 
@@ skipping 32 matching lines @@
   if (!algorithm_dict)
     return;
 
   scoped_ptr<content::V8ValueConverter> converter(
       content::V8ValueConverter::create());
   call_info.GetReturnValue().Set(
       converter->ToV8Value(algorithm_dict.get(), context()->v8_context()));
 }
 
 }  // namespace extensions