Fix handling of user and CA certificates on Android.

net/android/network_library.cc

Index: net/android/network_library.cc
diff --git a/net/android/network_library.cc b/net/android/network_library.cc
index ce5567928b4b4a8110ecc643f4b9e14e9d5cf67f..bd5038906a21e8187e6fa3a2b9d3351f393e4cff 100644
--- a/net/android/network_library.cc
+++ b/net/android/network_library.cc
@@ -64,6 +64,22 @@ bool StoreKeyPair(const uint8* public_key,
   return ret;
 }
 
+void StoreCertificateOrKeychain(const char* data,
+                                size_t data_len,
+                                bool is_pkcs12) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jbyteArray> data_array =
+      ToJavaByteArray(env, reinterpret_cast<const uint8*>(data), data_len);
+  jboolean ret = Java_AndroidNetworkLibrary_storeCertificateOrKeychain(env,
+      GetApplicationContext(), data_array.obj(), is_pkcs12);
+  LOG_IF(WARNING, !ret) <<
+      "Call to Java_AndroidNetworkLibrary_storeCertificateOrKeychain"
+      " failed";
+  // Intentionally do not return 'ret', there is little the caller can
+  // do in case of failure (the CertInstaller itself will deal with
+  // incorrect data and display the appropriate toast).
+}
+
 bool HaveOnlyLoopbackAddresses() {
   JNIEnv* env = AttachCurrentThread();
   return Java_AndroidNetworkLibrary_haveOnlyLoopbackAddresses(env);