Remove Android support for out-of-process KeyStores

android_webview/native/aw_contents_client_bridge_unittest.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 "android_webview/native/aw_contents_client_bridge.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
@@ skipping 63 matching lines @@
 
 void AwContentsClientBridgeTest::SetUp() {
   env_ = AttachCurrentThread();
   ASSERT_THAT(env_, NotNull());
   ASSERT_TRUE(android_webview::RegisterAwContentsClientBridge(env_));
   ASSERT_TRUE(RegisterNativesImpl(env_));
   ASSERT_TRUE(net::android::RegisterJni(env_));
   jbridge_.Reset(env_,
       Java_MockAwContentsClientBridge_getAwContentsClientBridge(env_).obj());
   bridge_.reset(new AwContentsClientBridge(env_, jbridge_.obj()));
-  selected_cert_ = NULL;
+  selected_cert_ = nullptr;
   cert_selected_callbacks_ = 0;
   cert_request_info_ = new net::SSLCertRequestInfo;
 }
 
 void AwContentsClientBridgeTest::CertSelected(X509Certificate* cert) {
   selected_cert_ = cert;
   cert_selected_callbacks_++;
 }
 
 TEST_F(AwContentsClientBridgeTest, TestClientCertKeyTypesCorrectlyEncoded) {
@@ skipping 31 matching lines @@
     TestProvideClientCertificateResponseCallsCallbackOnNullKey) {
   // Call SelectClientCertificate to create a callback id that mock java object
   // can call on.
   bridge_->SelectClientCertificate(
       cert_request_info_.get(),
       make_scoped_ptr(new TestClientCertificateDelegate(this)));
   bridge_->ProvideClientCertificateResponse(env_, jbridge_.obj(),
       Java_MockAwContentsClientBridge_getRequestId(env_, jbridge_.obj()),
       Java_MockAwContentsClientBridge_createTestCertChain(
           env_, jbridge_.obj()).obj(),
-      NULL);
+      nullptr);
   base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(NULL, selected_cert_);
+  EXPECT_EQ(nullptr, selected_cert_);
   EXPECT_EQ(1, cert_selected_callbacks_);
 }
 
 // Verify that ProvideClientCertificateResponse calls the callback with
-// NULL parameters when private key is not provided.
+// null parameters when private key is not provided.
 TEST_F(AwContentsClientBridgeTest,
     TestProvideClientCertificateResponseCallsCallbackOnNullChain) {
   // Call SelectClientCertificate to create a callback id that mock java object
   // can call on.
   bridge_->SelectClientCertificate(
       cert_request_info_.get(),
       make_scoped_ptr(new TestClientCertificateDelegate(this)));
   int requestId =
     Java_MockAwContentsClientBridge_getRequestId(env_, jbridge_.obj());
-  bridge_->ProvideClientCertificateResponse(env_, jbridge_.obj(),
-      requestId,
-      NULL,
-      Java_MockAwContentsClientBridge_createTestPrivateKey(
-          env_, jbridge_.obj()).obj());
+  bridge_->ProvideClientCertificateResponse(
+      env_, jbridge_.obj(), requestId, nullptr, nullptr);
   base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(NULL, selected_cert_);
+  EXPECT_EQ(nullptr, selected_cert_);
   EXPECT_EQ(1, cert_selected_callbacks_);
 }
 
 }   // android_webview