Index: net/android/network_library.cc |
diff --git a/net/android/network_library.cc b/net/android/network_library.cc |
index c3a42f700820bd13d5f0f8de3688c15534e0cbaf..1d8cbbdeea4f9b2fc817b1dfdf70703961bb8c2b 100644 |
--- a/net/android/network_library.cc |
+++ b/net/android/network_library.cc |
@@ -38,16 +38,15 @@ void VerifyX509CertChain(const std::vector<std::string>& cert_chain, |
ConvertUTF8ToJavaString(env, auth_type); |
DCHECK(!auth_string.is_null()); |
- ScopedJavaLocalRef<jstring> host_string = |
- ConvertUTF8ToJavaString(env, host); |
+ ScopedJavaLocalRef<jstring> host_string = ConvertUTF8ToJavaString(env, host); |
DCHECK(!host_string.is_null()); |
ScopedJavaLocalRef<jobject> result = |
Java_AndroidNetworkLibrary_verifyServerCertificates( |
env, chain_byte_array.obj(), auth_string.obj(), host_string.obj()); |
- ExtractCertVerifyResult(result.obj(), |
- status, is_issued_by_known_root, verified_chain); |
+ ExtractCertVerifyResult( |
+ result.obj(), status, is_issued_by_known_root, verified_chain); |
} |
void AddTestRootCertificate(const uint8* cert, size_t len) { |
@@ -71,10 +70,10 @@ bool StoreKeyPair(const uint8* public_key, |
ToJavaByteArray(env, public_key, public_len); |
ScopedJavaLocalRef<jbyteArray> private_array = |
ToJavaByteArray(env, private_key, private_len); |
- jboolean ret = Java_AndroidNetworkLibrary_storeKeyPair(env, |
- GetApplicationContext(), public_array.obj(), private_array.obj()); |
- LOG_IF(WARNING, !ret) << |
- "Call to Java_AndroidNetworkLibrary_storeKeyPair failed"; |
+ jboolean ret = Java_AndroidNetworkLibrary_storeKeyPair( |
+ env, GetApplicationContext(), public_array.obj(), private_array.obj()); |
+ LOG_IF(WARNING, !ret) |
+ << "Call to Java_AndroidNetworkLibrary_storeKeyPair failed"; |
return ret; |
} |
@@ -84,11 +83,10 @@ void StoreCertificate(net::CertificateMimeType cert_type, |
JNIEnv* env = AttachCurrentThread(); |
ScopedJavaLocalRef<jbyteArray> data_array = |
ToJavaByteArray(env, reinterpret_cast<const uint8*>(data), data_len); |
- jboolean ret = Java_AndroidNetworkLibrary_storeCertificate(env, |
- GetApplicationContext(), cert_type, data_array.obj()); |
- LOG_IF(WARNING, !ret) << |
- "Call to Java_AndroidNetworkLibrary_storeCertificate" |
- " failed"; |
+ jboolean ret = Java_AndroidNetworkLibrary_storeCertificate( |
+ env, GetApplicationContext(), cert_type, data_array.obj()); |
+ LOG_IF(WARNING, !ret) << "Call to Java_AndroidNetworkLibrary_storeCertificate" |
+ " 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). |