Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Unified Diff: net/websockets/websocket_handshake_stream_create_helper_test.cc

Issue 1256793008: Remove unused params in WebSocketHandshakeStreamCreateHelperTest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_handshake_stream_create_helper_test.cc
diff --git a/net/websockets/websocket_handshake_stream_create_helper_test.cc b/net/websockets/websocket_handshake_stream_create_helper_test.cc
index 2ebbd8efa2b21af391faaaf373d6b0eaba943ae7..17a388a43e15aa4b977aca3756b4518a654839ea 100644
--- a/net/websockets/websocket_handshake_stream_create_helper_test.cc
+++ b/net/websockets/websocket_handshake_stream_create_helper_test.cc
@@ -76,21 +76,18 @@ class TestConnectDelegate : public WebSocketStream::ConnectDelegate {
class WebSocketHandshakeStreamCreateHelperTest : public ::testing::Test {
protected:
scoped_ptr<WebSocketStream> CreateAndInitializeStream(
- const std::string& socket_url,
- const std::string& socket_host,
- const std::string& socket_path,
const std::vector<std::string>& sub_protocols,
- const std::string& origin,
const std::string& extra_request_headers,
const std::string& extra_response_headers) {
+ static const char kOrigin[] = "http://localhost";
WebSocketHandshakeStreamCreateHelper create_helper(&connect_delegate_,
sub_protocols);
create_helper.set_failure_message(&failure_message_);
scoped_ptr<ClientSocketHandle> socket_handle =
socket_handle_factory_.CreateClientSocketHandle(
- WebSocketStandardRequest(socket_path, socket_host,
- url::Origin(GURL(origin)),
+ WebSocketStandardRequest("/", "localhost",
+ url::Origin(GURL(kOrigin)),
extra_request_headers),
WebSocketStandardResponse(extra_response_headers));
@@ -104,7 +101,7 @@ class WebSocketHandshakeStreamCreateHelperTest : public ::testing::Test {
->SetWebSocketKeyForTesting("dGhlIHNhbXBsZSBub25jZQ==");
HttpRequestInfo request_info;
- request_info.url = GURL(socket_url);
+ request_info.url = GURL("ws://localhost/");
request_info.method = "GET";
request_info.load_flags = LOAD_DISABLE_CACHE;
int rv = handshake->InitializeStream(
@@ -117,7 +114,7 @@ class WebSocketHandshakeStreamCreateHelperTest : public ::testing::Test {
headers.SetHeader("Pragma", "no-cache");
headers.SetHeader("Cache-Control", "no-cache");
headers.SetHeader("Upgrade", "websocket");
- headers.SetHeader("Origin", origin);
+ headers.SetHeader("Origin", kOrigin);
headers.SetHeader("Sec-WebSocket-Version", "13");
headers.SetHeader("User-Agent", "");
headers.SetHeader("Accept-Encoding", "gzip, deflate");
@@ -145,9 +142,8 @@ class WebSocketHandshakeStreamCreateHelperTest : public ::testing::Test {
// Confirm that the basic case works as expected.
TEST_F(WebSocketHandshakeStreamCreateHelperTest, BasicStream) {
- scoped_ptr<WebSocketStream> stream = CreateAndInitializeStream(
- "ws://localhost/", "localhost", "/", std::vector<std::string>(),
- "http://localhost", "", "");
+ scoped_ptr<WebSocketStream> stream =
+ CreateAndInitializeStream(std::vector<std::string>(), "", "");
EXPECT_EQ("", stream->GetExtensions());
EXPECT_EQ("", stream->GetSubProtocol());
}
@@ -158,8 +154,7 @@ TEST_F(WebSocketHandshakeStreamCreateHelperTest, SubProtocols) {
sub_protocols.push_back("chat");
sub_protocols.push_back("superchat");
scoped_ptr<WebSocketStream> stream = CreateAndInitializeStream(
- "ws://localhost/", "localhost", "/", sub_protocols, "http://localhost",
- "Sec-WebSocket-Protocol: chat, superchat\r\n",
+ sub_protocols, "Sec-WebSocket-Protocol: chat, superchat\r\n",
"Sec-WebSocket-Protocol: superchat\r\n");
EXPECT_EQ("superchat", stream->GetSubProtocol());
}
@@ -168,8 +163,7 @@ TEST_F(WebSocketHandshakeStreamCreateHelperTest, SubProtocols) {
// websocket_stream_test.cc.
TEST_F(WebSocketHandshakeStreamCreateHelperTest, Extensions) {
scoped_ptr<WebSocketStream> stream = CreateAndInitializeStream(
- "ws://localhost/", "localhost", "/", std::vector<std::string>(),
- "http://localhost", "",
+ std::vector<std::string>(), "",
"Sec-WebSocket-Extensions: permessage-deflate\r\n");
EXPECT_EQ("permessage-deflate", stream->GetExtensions());
}
@@ -178,8 +172,7 @@ TEST_F(WebSocketHandshakeStreamCreateHelperTest, Extensions) {
// websocket_stream_test.cc.
TEST_F(WebSocketHandshakeStreamCreateHelperTest, ExtensionParameters) {
scoped_ptr<WebSocketStream> stream = CreateAndInitializeStream(
- "ws://localhost/", "localhost", "/", std::vector<std::string>(),
- "http://localhost", "",
+ std::vector<std::string>(), "",
"Sec-WebSocket-Extensions: permessage-deflate;"
" client_max_window_bits=14; server_max_window_bits=14;"
" server_no_context_takeover; client_no_context_takeover\r\n");
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698