diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 21:48:11 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 21:48:11 +0000 |
commit | 6e7845aed4759ab35d722ce0551b5a90d21e7640 (patch) | |
tree | f29a3f007f7ded842d2096446ff7ecaf186cb362 /content/browser/ssl | |
parent | a6b4f91d970aa2b71b0f3552dbc11e94f7650fd5 (diff) | |
download | chromium_src-6e7845aed4759ab35d722ce0551b5a90d21e7640.zip chromium_src-6e7845aed4759ab35d722ce0551b5a90d21e7640.tar.gz chromium_src-6e7845aed4759ab35d722ce0551b5a90d21e7640.tar.bz2 |
net: extract net/cert out of net/base
This introduces the following dependency of net/base on things outside:
net/base/openssl_client_key_store.cc:#include "net/cert/x509_certificate.h"
BUG=70818
Review URL: https://codereview.chromium.org/13006020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191450 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ssl')
-rw-r--r-- | content/browser/ssl/ssl_cert_error_handler.cc | 4 | ||||
-rw-r--r-- | content/browser/ssl/ssl_client_auth_handler.cc | 2 | ||||
-rw-r--r-- | content/browser/ssl/ssl_host_state.h | 6 | ||||
-rw-r--r-- | content/browser/ssl/ssl_manager.h | 2 | ||||
-rw-r--r-- | content/browser/ssl/ssl_policy_backend.h | 2 | ||||
-rw-r--r-- | content/browser/ssl/ssl_request_info.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/content/browser/ssl/ssl_cert_error_handler.cc b/content/browser/ssl/ssl_cert_error_handler.cc index 268ccf7..b3bdb41 100644 --- a/content/browser/ssl/ssl_cert_error_handler.cc +++ b/content/browser/ssl/ssl_cert_error_handler.cc @@ -6,8 +6,8 @@ #include "content/browser/ssl/ssl_manager.h" #include "content/browser/ssl/ssl_policy.h" -#include "net/base/cert_status_flags.h" -#include "net/base/x509_certificate.h" +#include "net/cert/cert_status_flags.h" +#include "net/cert/x509_certificate.h" namespace content { diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc index 97db658..1180269 100644 --- a/content/browser/ssl/ssl_client_auth_handler.cc +++ b/content/browser/ssl/ssl_client_auth_handler.cc @@ -9,7 +9,7 @@ #include "content/browser/loader/resource_request_info_impl.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" #include "net/http/http_transaction_factory.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" diff --git a/content/browser/ssl/ssl_host_state.h b/content/browser/ssl/ssl_host_state.h index da3fe9c..d3b69c2 100644 --- a/content/browser/ssl/ssl_host_state.h +++ b/content/browser/ssl/ssl_host_state.h @@ -5,17 +5,17 @@ #ifndef CONTENT_BROWSER_SSL_SSL_HOST_STATE_H_ #define CONTENT_BROWSER_SSL_SSL_HOST_STATE_H_ -#include <string> #include <map> #include <set> +#include <string> -#include "base/compiler_specific.h" #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/supports_user_data.h" #include "base/threading/non_thread_safe.h" #include "content/common/content_export.h" #include "googleurl/src/gurl.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace content { class BrowserContext; diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h index 8cd1668..0ccedb2 100644 --- a/content/browser/ssl/ssl_manager.h +++ b/content/browser/ssl/ssl_manager.h @@ -17,7 +17,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "googleurl/src/gurl.h" -#include "net/base/cert_status_flags.h" +#include "net/cert/cert_status_flags.h" #include "net/base/net_errors.h" namespace net { diff --git a/content/browser/ssl/ssl_policy_backend.h b/content/browser/ssl/ssl_policy_backend.h index 3d8f390..bef0469 100644 --- a/content/browser/ssl/ssl_policy_backend.h +++ b/content/browser/ssl/ssl_policy_backend.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "net/base/x509_certificate.h" +#include "net/cert/x509_certificate.h" namespace content { class NavigationControllerImpl; diff --git a/content/browser/ssl/ssl_request_info.h b/content/browser/ssl/ssl_request_info.h index 5e9428c..d5971ed 100644 --- a/content/browser/ssl/ssl_request_info.h +++ b/content/browser/ssl/ssl_request_info.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "googleurl/src/gurl.h" -#include "net/base/cert_status_flags.h" +#include "net/cert/cert_status_flags.h" #include "webkit/glue/resource_type.h" namespace content { |