summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-27 21:04:49 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-27 21:04:49 +0000
commitedbc4f91345a02160137f8fd506fefaca4e33f6a (patch)
tree98e5a1f9096b79e6f60f2c7c0ebd09218ac9780d /net/websockets
parentbb6ec17d7939713e4d0d9d2c25c2e1e734b0e96e (diff)
downloadchromium_src-edbc4f91345a02160137f8fd506fefaca4e33f6a.zip
chromium_src-edbc4f91345a02160137f8fd506fefaca4e33f6a.tar.gz
chromium_src-edbc4f91345a02160137f8fd506fefaca4e33f6a.tar.bz2
Make TransportSecurityState not ref-counted for simplicity.
BUG=none Review URL: http://codereview.chromium.org/8054001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103012 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket_job_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc
index 3555014..9a1a8bc 100644
--- a/net/websockets/websocket_job_unittest.cc
+++ b/net/websockets/websocket_job_unittest.cc
@@ -228,20 +228,20 @@ class MockSSLConfigService : public net::SSLConfigService {
class MockURLRequestContext : public net::URLRequestContext {
public:
- explicit MockURLRequestContext(net::CookieStore* cookie_store) {
+ explicit MockURLRequestContext(net::CookieStore* cookie_store)
+ : transport_security_state_(std::string()) {
set_cookie_store(cookie_store);
- transport_security_state_ = new net::TransportSecurityState(std::string());
- set_transport_security_state(transport_security_state_.get());
+ set_transport_security_state(&transport_security_state_);
net::TransportSecurityState::DomainState state;
state.expiry = base::Time::Now() + base::TimeDelta::FromSeconds(1000);
- transport_security_state_->EnableHost("upgrademe.com", state);
+ transport_security_state_.EnableHost("upgrademe.com", state);
}
private:
friend class base::RefCountedThreadSafe<MockURLRequestContext>;
virtual ~MockURLRequestContext() {}
- scoped_refptr<net::TransportSecurityState> transport_security_state_;
+ net::TransportSecurityState transport_security_state_;
};
class MockHttpTransactionFactory : public net::HttpTransactionFactory {