Remove the word "factory" from WebSocketChannel

net/websockets/websocket_channel.h

 // 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.
 
 #ifndef NET_WEBSOCKETS_WEBSOCKET_CHANNEL_H_
 #define NET_WEBSOCKETS_WEBSOCKET_CHANNEL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 16 matching lines @@
 class IOBuffer;
 class URLRequestContext;
 
 // Transport-independent implementation of WebSockets. Implements protocol
 // semantics that do not depend on the underlying transport. Provides the
 // interface to the content layer. Some WebSocket concepts are used here without
 // definition; please see the RFC at http://tools.ietf.org/html/rfc6455 for
 // clarification.
 class NET_EXPORT WebSocketChannel {
  public:
-  // The type of a WebSocketStream factory callback. Must match the signature of
+  // The type of a WebSocketStream creator callback. Must match the signature of
   // WebSocketStream::CreateAndConnectStream().
   typedef base::Callback<scoped_ptr<WebSocketStreamRequest>(
       const GURL&,
       const std::vector<std::string>&,
       const GURL&,
       URLRequestContext*,
       const BoundNetLog&,
-      scoped_ptr<WebSocketStream::ConnectDelegate>)> WebSocketStreamFactory;
+      scoped_ptr<WebSocketStream::ConnectDelegate>)> WebSocketStreamCreator;
 
   // Creates a new WebSocketChannel in an idle state.
   // SendAddChannelRequest() must be called immediately afterwards to start the
   // connection process.
   WebSocketChannel(scoped_ptr<WebSocketEventInterface> event_interface,
                    URLRequestContext* url_request_context);
   virtual ~WebSocketChannel();
 
   // Starts the connection process.
   void SendAddChannelRequest(
@@ skipping 25 matching lines @@
   // connection. There is no API to close the connection without a closing
   // handshake, but destroying the WebSocketChannel object while connected will
   // effectively do that. |code| must be in the range 1000-4999. |reason| should
   // be a valid UTF-8 string or empty.
   //
   // This does *not* trigger the event OnClosingHandshake(). The caller should
   // assume that the closing handshake has started and perform the equivalent
   // processing to OnClosingHandshake() if necessary.
   void StartClosingHandshake(uint16 code, const std::string& reason);
 
-  // Starts the connection process, using a specified factory function rather
+  // Starts the connection process, using a specified creator function rather

[tyoshino (SeeGerritForStatus), 2013/11/12 11:29:42]

s/function/callback/ for consistency?

[Adam Rice, 2013/11/13 03:16:53]

Done.

   // than the default. This is exposed for testing.
   void SendAddChannelRequestForTesting(
       const GURL& socket_url,
       const std::vector<std::string>& requested_protocols,
       const GURL& origin,
-      const WebSocketStreamFactory& factory);
+      const WebSocketStreamCreator& creator);
 
   // The default timout for the closing handshake is a sensible value (see
   // kClosingHandshakeTimeoutSeconds in websocket_channel.cc). However, we can
   // set it to a very small value for testing purposes.
   void SetClosingHandshakeTimeoutForTesting(base::TimeDelta delay);
 
  private:
   // Methods which return a value of type ChannelState may delete |this|. If the
   // return value is CHANNEL_DELETED, then the caller must return without making
   // any further access to member variables or methods.
@@ skipping 25 matching lines @@
   };
 
   // Implementation of WebSocketStream::ConnectDelegate for
   // WebSocketChannel. WebSocketChannel does not inherit from
   // WebSocketStream::ConnectDelegate directly to avoid cluttering the public
   // interface with the implementation of those methods, and because the
   // lifetime of a WebSocketChannel is longer than the lifetime of the
   // connection process.
   class ConnectDelegate;
 
-  // Starts the connection progress, using a specified factory function.
-  void SendAddChannelRequestWithFactory(
+  // Starts the connection progress, using the supplied creator function.

[tyoshino (SeeGerritForStatus), 2013/11/12 11:29:42]

ditto

[tyoshino (SeeGerritForStatus), 2013/11/12 11:29:42]

progress -> process

[Adam Rice, 2013/11/13 03:16:53]

Done.

[Adam Rice, 2013/11/13 03:16:53]

Done.

+  void SendAddChannelRequestWithSuppliedCreator(
       const GURL& socket_url,
       const std::vector<std::string>& requested_protocols,
       const GURL& origin,
-      const WebSocketStreamFactory& factory);
+      const WebSocketStreamCreator& creator);
 
   // Success callback from WebSocketStream::CreateAndConnectStream(). Reports
   // success to the event interface. May delete |this|.
   void OnConnectSuccess(scoped_ptr<WebSocketStream> stream);
 
   // Failure callback from WebSocketStream::CreateAndConnectStream(). Reports
   // failure to the event interface. May delete |this|.
   void OnConnectFailure(uint16 websocket_error);
 
   // Returns true if state_ is SEND_CLOSED, CLOSE_WAIT or CLOSED.
@@ skipping 72 matching lines @@
   // Called if the closing handshake times out. Closes the connection and
   // informs the |event_interface_| if appropriate.
   void CloseTimeout();
 
   // The URL of the remote server.
   GURL socket_url_;
 
   // The object receiving events.
   const scoped_ptr<WebSocketEventInterface> event_interface_;
 
-  // The URLRequestContext to pass to the WebSocketStream factory.
+  // The URLRequestContext to pass to the WebSocketStream creator.
   URLRequestContext* const url_request_context_;
 
   // The WebSocketStream on which to send and receive data.
   scoped_ptr<WebSocketStream> stream_;
 
   // A data structure containing a vector of frames to be sent and the total
   // number of bytes contained in the vector.
   class SendBuffer;
   // Data that is currently pending write, or NULL if no write is pending.
   scoped_ptr<SendBuffer> data_being_sent_;
@@ skipping 34 matching lines @@
   // The current state of the channel. Mainly used for sanity checking, but also
   // used to track the close state.
   State state_;
 
   DISALLOW_COPY_AND_ASSIGN(WebSocketChannel);
 };
 
 }  // namespace net
 
 #endif  // NET_WEBSOCKETS_WEBSOCKET_CHANNEL_H_