Remove the word "factory" from WebSocketChannel

net/websockets/websocket_channel.cc

 // Copyright 2013 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_channel.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"  // for size_t
 #include "base/bind.h"
@@ skipping 134 matching lines @@
   // The timer may have a callback pointing back to us, so stop it just in case
   // someone decides to run the event loop from their destructor.
   timer_.Stop();
 }
 
 void WebSocketChannel::SendAddChannelRequest(
     const GURL& socket_url,
     const std::vector<std::string>& requested_subprotocols,
     const GURL& origin) {
   // Delegate to the tested version.
-  SendAddChannelRequestWithFactory(
+  SendAddChannelRequestWithSuppliedCreator(
       socket_url,
       requested_subprotocols,
       origin,
       base::Bind(&WebSocketStream::CreateAndConnectStream));
 }
 
 bool WebSocketChannel::InClosingState() const {
   // The state RECV_CLOSED is not supported here, because it is only used in one
   // code path and should not leak into the code in general.
   DCHECK_NE(RECV_CLOSED, state_)
@@ skipping 80 matching lines @@
     return;
   }
   AllowUnused(SendClose(code, IsStringUTF8(reason) ? reason : std::string()));
   // |this| may have been deleted.
 }
 
 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(
     base::TimeDelta delay) {
   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_,
                                 BoundNetLog(),
                                 connect_delegate.Pass());
   state_ = CONNECTING;
 }
 
 void WebSocketChannel::OnConnectSuccess(scoped_ptr<WebSocketStream> stream) {
   DCHECK(stream);
@@ skipping 418 matching lines @@
 void WebSocketChannel::CloseTimeout() {
   stream_->Close();
   DCHECK_NE(CLOSED, state_);
   state_ = CLOSED;
   AllowUnused(event_interface_->OnDropChannel(kWebSocketErrorAbnormalClosure,
                                               "Abnormal Closure"));
   // |this| has been deleted.
 }
 
 }  // namespace net