Remove the word "factory" from WebSocketChannel

net/websockets/websocket_channel.h

Index: net/websockets/websocket_channel.h
diff --git a/net/websockets/websocket_channel.h b/net/websockets/websocket_channel.h
index 9bd362328ce7be9cb4d8e924d51b7b9886bd216b..088ca810d0f0a8d27b57d0ff76357763dcfce55c 100644
--- a/net/websockets/websocket_channel.h
+++ b/net/websockets/websocket_channel.h
@@ -34,7 +34,7 @@ class URLRequestContext;
 // 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&,
@@ -42,7 +42,7 @@ class NET_EXPORT WebSocketChannel {
       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
@@ -88,13 +88,13 @@ class NET_EXPORT WebSocketChannel {
   // 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
@@ -140,12 +140,12 @@ class NET_EXPORT WebSocketChannel {
   // 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|.
@@ -238,7 +238,7 @@ class NET_EXPORT WebSocketChannel {
   // 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.