| Index: Source/modules/websockets/DOMWebSocketTest.cpp
|
| diff --git a/Source/modules/websockets/DOMWebSocketTest.cpp b/Source/modules/websockets/DOMWebSocketTest.cpp
|
| index 9d67c95a9cde189617176795207161e4eaf3a637..f8b9f1727e25c13af8cb1d042fd4af5b59b77c5f 100644
|
| --- a/Source/modules/websockets/DOMWebSocketTest.cpp
|
| +++ b/Source/modules/websockets/DOMWebSocketTest.cpp
|
| @@ -189,14 +189,14 @@ TEST_F(DOMWebSocketTest, invalidSubprotocols)
|
| EXPECT_EQ(DOMWebSocket::CLOSED, m_websocket->readyState());
|
| }
|
|
|
| -TEST_F(DOMWebSocketTest, insecureContentUpgrade)
|
| +TEST_F(DOMWebSocketTest, insecureRequestsUpgrade)
|
| {
|
| {
|
| InSequence s;
|
| EXPECT_CALL(channel(), connect(KURL(KURL(), "wss://example.com/endpoint"), String())).WillOnce(Return(true));
|
| }
|
|
|
| - m_pageHolder->document().setInsecureContentPolicy(SecurityContext::InsecureContentUpgrade);
|
| + m_pageHolder->document().setInsecureRequestsPolicy(SecurityContext::InsecureRequestsUpgrade);
|
| m_websocket->connect("ws://example.com/endpoint", Vector<String>(), m_exceptionState);
|
|
|
| EXPECT_FALSE(m_exceptionState.hadException());
|
| @@ -204,14 +204,14 @@ TEST_F(DOMWebSocketTest, insecureContentUpgrade)
|
| EXPECT_EQ(KURL(KURL(), "wss://example.com/endpoint"), m_websocket->url());
|
| }
|
|
|
| -TEST_F(DOMWebSocketTest, insecureContentDoNotUpgrade)
|
| +TEST_F(DOMWebSocketTest, insecureRequestsDoNotUpgrade)
|
| {
|
| {
|
| InSequence s;
|
| EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/endpoint"), String())).WillOnce(Return(true));
|
| }
|
|
|
| - m_pageHolder->document().setInsecureContentPolicy(SecurityContext::InsecureContentDoNotUpgrade);
|
| + m_pageHolder->document().setInsecureRequestsPolicy(SecurityContext::InsecureRequestsDoNotUpgrade);
|
| m_websocket->connect("ws://example.com/endpoint", Vector<String>(), m_exceptionState);
|
|
|
| EXPECT_FALSE(m_exceptionState.hadException());
|
|
|