Refactor TransportSecurityState.

net/websockets/websocket_job_spdy2_unittest.cc

Index: net/websockets/websocket_job_spdy2_unittest.cc
===================================================================
--- net/websockets/websocket_job_spdy2_unittest.cc	(revision 133741)
+++ net/websockets/websocket_job_spdy2_unittest.cc	(working copy)
@@ -178,7 +178,7 @@
       const net::CookieOptions& options) {
     std::string result;
     for (size_t i = 0; i < entries_.size(); i++) {
-      Entry &entry = entries_[i];
+      Entry& entry = entries_[i];
       if (url == entry.url) {
         if (!result.empty()) {
           result += "; ";
@@ -235,17 +235,18 @@
 
 class MockSSLConfigService : public net::SSLConfigService {
  public:
-  virtual void GetSSLConfig(net::SSLConfig* config) {};
+  virtual void GetSSLConfig(net::SSLConfig* config) {}
 };
 
 class MockURLRequestContext : public net::URLRequestContext {
  public:
   explicit MockURLRequestContext(net::CookieStore* cookie_store)
-      : transport_security_state_(std::string()) {
+      : transport_security_state_() {
     set_cookie_store(cookie_store);
     set_transport_security_state(&transport_security_state_);
     net::TransportSecurityState::DomainState state;
-    state.expiry = base::Time::Now() + base::TimeDelta::FromSeconds(1000);
+    state.upgrade_expiry = base::Time::Now() +
+        base::TimeDelta::FromSeconds(1000);
     transport_security_state_.EnableHost("upgrademe.com", state);
   }
 
@@ -258,7 +259,7 @@
 
 class MockHttpTransactionFactory : public net::HttpTransactionFactory {
  public:
-  MockHttpTransactionFactory(net::OrderedSocketData* data) {
+  explicit MockHttpTransactionFactory(net::OrderedSocketData* data) {
     data_ = data;
     net::MockConnect connect_data(net::SYNCHRONOUS, net::OK);
     data_->set_connect_data(connect_data);