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

Unified Diff: net/websockets/websocket_channel.cc

Issue 66013003: Remove the word "factory" from WebSocketChannel (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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
Index: net/websockets/websocket_channel.cc
diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc
index 81186117879fdb72426756d5bf7443a0472fcacf..f9d59601b17413c490af59bf683ed26afc0575dc 100644
--- a/net/websockets/websocket_channel.cc
+++ b/net/websockets/websocket_channel.cc
@@ -152,7 +152,7 @@ void WebSocketChannel::SendAddChannelRequest(
const std::vector<std::string>& requested_subprotocols,
const GURL& origin) {
// Delegate to the tested version.
- SendAddChannelRequestWithFactory(
+ SendAddChannelRequestWithSuppliedCreator(
socket_url,
requested_subprotocols,
origin,
@@ -253,9 +253,9 @@ void WebSocketChannel::SendAddChannelRequestForTesting(
const GURL& socket_url,
const std::vector<std::string>& requested_subprotocols,
const GURL& origin,
- const WebSocketStreamFactory& factory) {
- SendAddChannelRequestWithFactory(
- socket_url, requested_subprotocols, origin, factory);
+ const WebSocketStreamCreator& creator) {
+ SendAddChannelRequestWithSuppliedCreator(
+ socket_url, requested_subprotocols, origin, creator);
}
void WebSocketChannel::SetClosingHandshakeTimeoutForTesting(
@@ -263,16 +263,16 @@ void WebSocketChannel::SetClosingHandshakeTimeoutForTesting(
timeout_ = delay;
}
-void WebSocketChannel::SendAddChannelRequestWithFactory(
+void WebSocketChannel::SendAddChannelRequestWithSuppliedCreator(
const GURL& socket_url,
const std::vector<std::string>& requested_subprotocols,
const GURL& origin,
- const WebSocketStreamFactory& factory) {
+ const WebSocketStreamCreator& creator) {
DCHECK_EQ(FRESHLY_CONSTRUCTED, state_);
socket_url_ = socket_url;
scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate(
new ConnectDelegate(this));
- stream_request_ = factory.Run(socket_url_,
+ stream_request_ = creator.Run(socket_url_,
requested_subprotocols,
origin,
url_request_context_,

Powered by Google App Engine
This is Rietveld 408576698