Refactor TransportSecurityState.

net/websockets/websocket_job_spdy2_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/websockets/websocket_job.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 160 matching lines @@
       const SetCookiesCallback& callback) {
     bool result = SetCookieWithOptions(url, cookie_line, options);
     if (!callback.is_null())
       callback.Run(result);
   }
   virtual std::string GetCookiesWithOptions(
       const GURL& url,
       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 += "; ";
         }
         result += entry.cookie_line;
       }
     }
     return result;
   }
   virtual void GetCookiesWithOptionsAsync(
@@ skipping 39 matching lines @@
 
  private:
   friend class base::RefCountedThreadSafe<MockCookieStore>;
   virtual ~MockCookieStore() {}
 
   std::vector<Entry> entries_;
 };
 
 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);
   }
 
  private:
   friend class base::RefCountedThreadSafe<MockURLRequestContext>;
   virtual ~MockURLRequestContext() {}
 
   net::TransportSecurityState transport_security_state_;
 };
 
 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);
     session_deps_.reset(new SpdySessionDependencies);
     session_deps_->socket_factory->AddSocketDataProvider(data_);
     http_session_ =
         SpdySessionDependencies::SpdyCreateSession(session_deps_.get());
     host_port_pair_.set_host("example.com");
     host_port_pair_.set_port(80);
     host_port_proxy_pair_.first = host_port_pair_;
@@ skipping 822 matching lines @@
 
 TEST_F(WebSocketJobSpdy2Test, ThrottlingSpdySpdyEnabled) {
   WebSocketJob::set_websocket_over_spdy_enabled(true);
   TestConnectBySpdy(SPDY_ON, THROTTLING_ON);
 }
 
 // TODO(toyoshim): Add tests to verify throttling, SPDY stream limitation.
 // TODO(toyoshim,yutak): Add tests to verify closing handshake.
 
 }  // namespace net