| Index: net/android/network_library.h
|
| diff --git a/net/android/network_library.h b/net/android/network_library.h
|
| index f18ee19c5a944ca1f33afb75fd200d4219d066ea..3f1d44e16fb6faa36fbf8842965a21c15fbe8e16 100644
|
| --- a/net/android/network_library.h
|
| +++ b/net/android/network_library.h
|
| @@ -6,11 +6,11 @@
|
| #define NET_ANDROID_NETWORK_LIBRARY_H_
|
|
|
| #include <jni.h>
|
| +#include <stdint.h>
|
|
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "net/android/cert_verify_result_android.h"
|
| #include "net/base/mime_util.h"
|
| #include "net/base/net_export.h"
|
| @@ -30,7 +30,7 @@ void VerifyX509CertChain(const std::vector<std::string>& cert_chain,
|
|
|
| // Adds a certificate as a root trust certificate to the trust manager.
|
| // |cert| is DER encoded certificate, |len| is its length in bytes.
|
| -void AddTestRootCertificate(const uint8* cert, size_t len);
|
| +void AddTestRootCertificate(const uint8_t* cert, size_t len);
|
|
|
| // Removes all root certificates added by |AddTestRootCertificate| calls.
|
| void ClearTestRootCertificates();
|
| @@ -44,9 +44,9 @@ void ClearTestRootCertificates();
|
| // i2d_PKCS8_PRIV_KEY_INFO(EVP_PKEY2PKCS8(pkey)), which is a different
|
| // format than what i2d_PrivateKey() returns, so don't use it either.
|
| //
|
| -bool StoreKeyPair(const uint8* public_key,
|
| +bool StoreKeyPair(const uint8_t* public_key,
|
| size_t public_len,
|
| - const uint8* private_key,
|
| + const uint8_t* private_key,
|
| size_t private_len);
|
|
|
| // Helper used to pass the DER-encoded bytes of an X.509 certificate or
|
|
|