summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-03-10 04:47:16 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-10 12:48:38 +0000
commit133356a9829549b1647e206f619e12bc2f7b3fe1 (patch)
tree7f3c03e1c11eb67d40457ccb2b8a07f6e249e40f /net
parentcb3f85f80a2c146e0e4bf064f02bf68acb274ce5 (diff)
downloadchromium_src-133356a9829549b1647e206f619e12bc2f7b3fe1.zip
chromium_src-133356a9829549b1647e206f619e12bc2f7b3fe1.tar.gz
chromium_src-133356a9829549b1647e206f619e12bc2f7b3fe1.tar.bz2
Another attempt to properly initialize net::TestURLRequestContext::ct_policy_enforcer_.
r380368 was not enough, as there are two ctors. TBR=estark@chromium.org Review URL: https://codereview.chromium.org/1772343006 Cr-Commit-Position: refs/heads/master@{#380396}
Diffstat (limited to 'net')
-rw-r--r--net/url_request/url_request_test_util.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 817837a..330104b 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -51,19 +51,13 @@ const int kStageDestruction = 1 << 10;
} // namespace
-TestURLRequestContext::TestURLRequestContext()
- : initialized_(false),
- client_socket_factory_(nullptr),
- proxy_delegate_(nullptr),
- ct_policy_enforcer_(nullptr),
- context_storage_(this) {
- Init();
-}
+TestURLRequestContext::TestURLRequestContext() : TestURLRequestContext(false) {}
TestURLRequestContext::TestURLRequestContext(bool delay_initialization)
: initialized_(false),
client_socket_factory_(nullptr),
proxy_delegate_(nullptr),
+ ct_policy_enforcer_(nullptr),
context_storage_(this) {
if (!delay_initialization)
Init();