Remove Android support for out-of-process KeyStores

android_webview/native/aw_contents_client_bridge_unittest.cc

Index: android_webview/native/aw_contents_client_bridge_unittest.cc
diff --git a/android_webview/native/aw_contents_client_bridge_unittest.cc b/android_webview/native/aw_contents_client_bridge_unittest.cc
index f7a1de8a792cb6ee476bf296149e0f1bd1287337..5f19a52adb660b0a461e2897530e2405c128d701 100644
--- a/android_webview/native/aw_contents_client_bridge_unittest.cc
+++ b/android_webview/native/aw_contents_client_bridge_unittest.cc
@@ -81,7 +81,7 @@ void AwContentsClientBridgeTest::SetUp() {
   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;
 }
@@ -133,14 +133,14 @@ TEST_F(AwContentsClientBridgeTest,
       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
@@ -150,13 +150,10 @@ TEST_F(AwContentsClientBridgeTest,
       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_);
 }