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 /sync/tools | |
| 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 'sync/tools')
| -rw-r--r-- | sync/tools/sync_client.cc | 2 | ||||
| -rw-r--r-- | sync/tools/sync_listen_notifications.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index d973093..c773168 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -24,7 +24,7 @@ #include "net/base/host_port_pair.h" #include "net/base/host_resolver.h" #include "net/base/network_change_notifier.h" -#include "net/base/transport_security_state.h" +#include "net/http/transport_security_state.h" #include "net/url_request/url_request_test_util.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/base_node.h" diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc index 9e958ca..c863df3 100644 --- a/sync/tools/sync_listen_notifications.cc +++ b/sync/tools/sync_listen_notifications.cc @@ -19,15 +19,15 @@ #include "net/base/host_port_pair.h" #include "net/base/host_resolver.h" #include "net/base/network_change_notifier.h" -#include "net/base/transport_security_state.h" +#include "net/http/transport_security_state.h" #include "net/url_request/url_request_test_util.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/base/model_type_invalidation_map.h" -#include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/invalidation_handler.h" +#include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/invalidation_util.h" -#include "sync/notifier/invalidator_factory.h" #include "sync/notifier/invalidator.h" +#include "sync/notifier/invalidator_factory.h" #include "sync/tools/null_invalidation_state_tracker.h" #if defined(OS_MACOSX) |