Commit 73d9999f authored by akalin@chromium.org's avatar akalin@chromium.org

[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
parent 33dda78b
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "net/base/host_port_pair.h" #include "net/base/host_port_pair.h"
#include "net/base/host_resolver.h" #include "net/base/host_resolver.h"
#include "net/base/network_change_notifier.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 "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.h"
#include "sync/internal_api/public/base_node.h" #include "sync/internal_api/public/base_node.h"
...@@ -102,6 +103,8 @@ class MyTestURLRequestContext : public TestURLRequestContext { ...@@ -102,6 +103,8 @@ class MyTestURLRequestContext : public TestURLRequestContext {
net::HostResolver::kDefaultParallelism, net::HostResolver::kDefaultParallelism,
net::HostResolver::kDefaultRetryAttempts, net::HostResolver::kDefaultRetryAttempts,
NULL)); NULL));
context_storage_.set_transport_security_state(
new net::TransportSecurityState());
Init(); Init();
} }
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "net/base/host_port_pair.h" #include "net/base/host_port_pair.h"
#include "net/base/host_resolver.h" #include "net/base/host_resolver.h"
#include "net/base/network_change_notifier.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 "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.h"
#include "sync/internal_api/public/base/model_type_payload_map.h" #include "sync/internal_api/public/base/model_type_payload_map.h"
...@@ -118,6 +119,8 @@ class MyTestURLRequestContext : public TestURLRequestContext { ...@@ -118,6 +119,8 @@ class MyTestURLRequestContext : public TestURLRequestContext {
net::HostResolver::kDefaultParallelism, net::HostResolver::kDefaultParallelism,
net::HostResolver::kDefaultRetryAttempts, net::HostResolver::kDefaultRetryAttempts,
NULL)); NULL));
context_storage_.set_transport_security_state(
new net::TransportSecurityState());
Init(); Init();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment