Apply HSTS rules to also upgrade ws:// -> wss:// if appropriate. This avoids

net/websockets/websocket_job_unittest.cc

 // Copyright (c) 2011 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 <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/cookie_policy.h"
 #include "net/base/cookie_store.h"
 #include "net/base/net_errors.h"
 #include "net/base/sys_addrinfo.h"
+#include "net/base/transport_security_state.h"
 #include "net/socket_stream/socket_stream.h"
 #include "net/url_request/url_request_context.h"
 #include "net/websockets/websocket_job.h"
 #include "net/websockets/websocket_throttle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/platform_test.h"
 
 namespace net {
 
@@ skipping 123 matching lines @@
  private:
   bool allow_all_cookies_;
 };
 
 class MockURLRequestContext : public URLRequestContext {
  public:
   MockURLRequestContext(CookieStore* cookie_store,
                         CookiePolicy* cookie_policy) {
     set_cookie_store(cookie_store);
     set_cookie_policy(cookie_policy);
+    transport_security_state_ = new TransportSecurityState();
+    set_transport_security_state(transport_security_state_.get());
+    TransportSecurityState::DomainState state;
+    state.expiry = base::Time::Now() + base::TimeDelta::FromSeconds(1000);
+    transport_security_state_->EnableHost("upgrademe.com", state);
   }
 
  private:
   friend class base::RefCountedThreadSafe<MockURLRequestContext>;
   virtual ~MockURLRequestContext() {}
+
+  scoped_refptr<TransportSecurityState> transport_security_state_;
 };
 
 class WebSocketJobTest : public PlatformTest {
  public:
   virtual void SetUp() {
     cookie_store_ = new MockCookieStore;
     cookie_policy_.reset(new MockCookiePolicy);
     context_ = new MockURLRequestContext(
         cookie_store_.get(), cookie_policy_.get());
   }
@@ skipping 28 matching lines @@
   }
   void CloseWebSocketJob() {
     if (websocket_->socket_) {
       websocket_->socket_->DetachDelegate();
       WebSocketThrottle::GetInstance()->RemoveFromQueue(websocket_);
     }
     websocket_->state_ = WebSocketJob::CLOSED;
     websocket_->delegate_ = NULL;
     websocket_->socket_ = NULL;
   }
+  SocketStream* GetSocket(SocketStreamJob* job) {
+    return job->socket_.get();
+  }
 
   scoped_refptr<MockCookieStore> cookie_store_;
   scoped_ptr<MockCookiePolicy> cookie_policy_;
   scoped_refptr<MockURLRequestContext> context_;
   scoped_refptr<WebSocketJob> websocket_;
   scoped_refptr<MockSocketStream> socket_;
 };
 
 TEST_F(WebSocketJobTest, SimpleHandshake) {
   GURL url("ws://example.com/demo");
@@ skipping 265 matching lines @@
 
   EXPECT_EQ(2U, cookie_store_->entries().size());
   EXPECT_EQ(cookieUrl, cookie_store_->entries()[0].url);
   EXPECT_EQ("CR-test=1", cookie_store_->entries()[0].cookie_line);
   EXPECT_EQ(cookieUrl, cookie_store_->entries()[1].url);
   EXPECT_EQ("CR-test-httponly=1", cookie_store_->entries()[1].cookie_line);
 
   CloseWebSocketJob();
 }
 
+TEST_F(WebSocketJobTest, HSTSUpgrade) {
+  GURL url("ws://upgrademe.com/");
+  MockSocketStreamDelegate delegate;
+  scoped_refptr<SocketStreamJob> job = SocketStreamJob::CreateSocketStreamJob(
+      url, &delegate, *context_.get());
+  EXPECT_TRUE(GetSocket(job.get())->is_secure());
+  job->DetachDelegate();
+
+  url = GURL("ws://donotupgrademe.com/");
+  job = SocketStreamJob::CreateSocketStreamJob(
+      url, &delegate, *context_.get());
+  EXPECT_FALSE(GetSocket(job.get())->is_secure());
+  job->DetachDelegate();
+}
+
 }  // namespace net