diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 17:41:57 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 17:41:57 +0000 |
| commit | 536fd0b69edf4b73f057fe9c79f15beddd239ef8 (patch) | |
| tree | 99ef55ba067df92fde47b22c03bc120c7bcf71d3 /net/android | |
| parent | 01b9f9aca9bb152b809c0310dd439c7cb4fdc87c (diff) | |
| download | chromium_src-536fd0b69edf4b73f057fe9c79f15beddd239ef8.zip chromium_src-536fd0b69edf4b73f057fe9c79f15beddd239ef8.tar.gz chromium_src-536fd0b69edf4b73f057fe9c79f15beddd239ef8.tar.bz2 | |
net: split net/ssl out of net/base
Also moves transport_security_state files to net/http.
This change also updates the callers.
R=wtc
TBR=rsleevi,lambroslambrou,tony
BUG=70818
Review URL: https://codereview.chromium.org/12680003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android')
| -rw-r--r-- | net/android/keystore.h | 2 | ||||
| -rw-r--r-- | net/android/keystore_openssl.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/android/keystore.h b/net/android/keystore.h index 6267719..32f0723 100644 --- a/net/android/keystore.h +++ b/net/android/keystore.h @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/string_piece.h" #include "net/base/net_export.h" -#include "net/base/ssl_client_cert_type.h" +#include "net/ssl/ssl_client_cert_type.h" // Avoid including <openssl/evp.h> here. typedef struct evp_pkey_st EVP_PKEY; diff --git a/net/android/keystore_openssl.cc b/net/android/keystore_openssl.cc index 900bf85..cc463f4 100644 --- a/net/android/keystore_openssl.cc +++ b/net/android/keystore_openssl.cc @@ -27,7 +27,7 @@ #include "base/logging.h" #include "crypto/openssl_util.h" #include "net/android/keystore.h" -#include "net/base/ssl_client_cert_type.h" +#include "net/ssl/ssl_client_cert_type.h" // IMPORTANT NOTE: The following code will currently only work when used // to implement client certificate support with OpenSSL. That's because |