Switch AwTokenBindingManager's internals to PKCS#8.

android_webview/native/token_binding_manager_bridge.cc

 // Copyright 2016 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 "android_webview/native/token_binding_manager_bridge.h"
 
 #include "android_webview/browser/net/token_binding_manager.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "content/public/browser/browser_thread.h"
 #include "crypto/ec_private_key.h"
 #include "jni/AwTokenBindingManager_jni.h"
 #include "net/base/net_errors.h"
-#include "net/ssl/channel_id_service.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ScopedJavaGlobalRef;
 using content::BrowserThread;
-using net::ChannelIDService;
 
 namespace android_webview {
 
 namespace {
 
 // Provides the key to the Webview client.
 void OnKeyReady(const ScopedJavaGlobalRef<jobject>& callback,
                 int status,
                 crypto::ECPrivateKey* key) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   JNIEnv* env = base::android::AttachCurrentThread();
 
   if (status != net::OK || !key) {
     Java_AwTokenBindingManager_onKeyReady(env, callback.obj(), nullptr,
                                           nullptr);
     return;
   }
 
   std::vector<uint8_t> private_key;
-  key->ExportEncryptedPrivateKey(ChannelIDService::kEPKIPassword, 1,
-                                 &private_key);
+  key->ExportPrivateKey(&private_key);
   ScopedJavaLocalRef<jbyteArray> jprivate_key = base::android::ToJavaByteArray(
       env, private_key.data(), private_key.size());
 
   std::vector<uint8_t> public_key;
   key->ExportPublicKey(&public_key);
   ScopedJavaLocalRef<jbyteArray> jpublic_key = base::android::ToJavaByteArray(
       env, public_key.data(), public_key.size());
 
   Java_AwTokenBindingManager_onKeyReady(env, callback.obj(), jprivate_key.obj(),
                                         jpublic_key.obj());
@@ skipping 58 matching lines @@
   TokenBindingManager::DeletionCompleteCallback complete_callback =
       base::Bind(&OnDeletionComplete, j_callback);
   TokenBindingManager::GetInstance()->DeleteAllKeys(complete_callback);
 }
 
 bool RegisterTokenBindingManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // android_webview namespace