diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 21:29:28 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 21:29:28 +0000 |
| commit | 73d9999f6a92d5d075f9c0ada81d66750edd01eb (patch) | |
| tree | b91bab77a10601902261a7ff9bc153683562475f /sync | |
| parent | 33dda78b76c03f7a3b550ee106f26117377f50ee (diff) | |
| download | chromium_src-73d9999f6a92d5d075f9c0ada81d66750edd01eb.zip chromium_src-73d9999f6a92d5d075f9c0ada81d66750edd01eb.tar.gz chromium_src-73d9999f6a92d5d075f9c0ada81d66750edd01eb.tar.bz2 | |
[Sync] Set transport_security_state for sync_{client,listen_notifications}
Currently, the DCHECK added by r148251 fires.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10830164
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/tools/sync_client.cc | 3 | ||||
| -rw-r--r-- | sync/tools/sync_listen_notifications.cc | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index 8e47287..f671edc 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -25,6 +25,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/url_request/url_request_test_util.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/base_node.h" @@ -102,6 +103,8 @@ class MyTestURLRequestContext : public TestURLRequestContext { net::HostResolver::kDefaultParallelism, net::HostResolver::kDefaultRetryAttempts, NULL)); + context_storage_.set_transport_security_state( + new net::TransportSecurityState()); Init(); } diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc index 22b22d6..5eb05b6 100644 --- a/sync/tools/sync_listen_notifications.cc +++ b/sync/tools/sync_listen_notifications.cc @@ -20,6 +20,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/url_request/url_request_test_util.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/base/model_type_payload_map.h" @@ -118,6 +119,8 @@ class MyTestURLRequestContext : public TestURLRequestContext { net::HostResolver::kDefaultParallelism, net::HostResolver::kDefaultRetryAttempts, NULL)); + context_storage_.set_transport_security_state( + new net::TransportSecurityState()); Init(); } |