Introduce webkit_glue bridges for the new WebSocket Implementation.

content/common/websocket_messages.h

Index: content/common/websocket_messages.h
diff --git a/content/common/websocket_messages.h b/content/common/websocket_messages.h
index a3dd68cb67144b8e1ef960576d6f353f0b3db7de..5a9304f8a700888fcfc2b5c7b72fdf566ac5341e 100644
--- a/content/common/websocket_messages.h
+++ b/content/common/websocket_messages.h
@@ -38,11 +38,10 @@
 // The browser process will not send |channel_id| as-is to the remote server; it
 // will try to use a short id on the wire. This saves the renderer from
 // having to try to choose the ids cleverly.
-IPC_MESSAGE_CONTROL4(WebSocketHostMsg_AddChannelRequest,
-                     int /* channel_id */,
-                     GURL /* socket_url */,
-                     std::vector<std::string> /* requested_protocols */,
-                     GURL /* origin */)
+IPC_MESSAGE_ROUTED3(WebSocketHostMsg_AddChannelRequest,
+                    GURL /* socket_url */,
+                    std::vector<std::string> /* requested_protocols */,
+                    GURL /* origin */)
 
 // Web Socket messages sent from the browser to the renderer.
 
@@ -55,11 +54,10 @@ IPC_MESSAGE_CONTROL4(WebSocketHostMsg_AddChannelRequest,
 // re-use. |selected_protocol| is the sub-protocol the server selected,
 // or empty if no sub-protocol was selected. |extensions| is the list of
 // extensions negotiated for the connection.
-IPC_MESSAGE_CONTROL4(WebSocketMsg_AddChannelResponse,
-                     int /* channel_id */,
-                     bool /* fail */,
-                     std::string /* selected_protocol */,
-                     std::string /* extensions */)
+IPC_MESSAGE_ROUTED3(WebSocketMsg_AddChannelResponse,
+                    bool /* fail */,
+                    std::string /* selected_protocol */,
+                    std::string /* extensions */)
 
 // WebSocket messages that can be sent in either direction.
 
@@ -75,11 +73,10 @@ IPC_ENUM_TRAITS(content::WebSocketMessageType)
 // first message. If |type| is WEB_SOCKET_MESSAGE_TYPE_TEXT, then the
 // concatenation of the |data| from every frame in the message must be valid
 // UTF-8. If |fin| is not set, |data| must be non-empty.
-IPC_MESSAGE_CONTROL4(WebSocketMsg_SendFrame,
-                     int /* channel_id */,
-                     bool /* fin */,
-                     content::WebSocketMessageType /* type */,
-                     std::vector<char> /* data */)
+IPC_MESSAGE_ROUTED3(WebSocketMsg_SendFrame,
+                    bool /* fin */,
+                    content::WebSocketMessageType /* type */,
+                    std::vector<char> /* data */)
 
 // Add |quota| tokens of send quota for channel |channel_id|. |quota| must be a
 // positive integer. Both the browser and the renderer set send quota for the
@@ -87,9 +84,8 @@ IPC_MESSAGE_CONTROL4(WebSocketMsg_SendFrame,
 // messages. Both sides start a new channel with a quota of 0, and must wait for
 // a FlowControl message before calling SendFrame. The total available quota on
 // one side must never exceed 0x7FFFFFFFFFFFFFFF tokens.
-IPC_MESSAGE_CONTROL2(WebSocketMsg_FlowControl,
-                     int /* channel_id */,
-                     int64 /* quota */)
+IPC_MESSAGE_ROUTED1(WebSocketMsg_FlowControl,
+                    int64 /* quota */)
 
 // Drop the channel.
 // When sent by the renderer, this will cause a DropChannel message to be sent
@@ -104,7 +100,6 @@ IPC_MESSAGE_CONTROL2(WebSocketMsg_FlowControl,
 // UTF-8 encoded string which may be useful for debugging but is not necessarily
 // human-readable, as supplied by the server in the Close or DropChannel
 // message.
-IPC_MESSAGE_CONTROL3(WebSocketMsg_DropChannel,
-                     int /* channel_id */,
-                     unsigned short /* code */,
-                     std::string /* reason */)
+IPC_MESSAGE_ROUTED2(WebSocketMsg_DropChannel,
+                    unsigned short /* code */,
+                    std::string /* reason */)