Introduce url::Origin to represent Web Origin.

content/common/websocket_messages.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.
 
 // Multiply-included message file, hence no include guard.
 
 // This file defines the IPCs for the browser-side implementation of
 // WebSockets. For the legacy renderer-side implementation, see
 // socket_stream_messages.h.
 // TODO(ricea): Fix this comment when the legacy implementation has been
 // removed.
 //
 // This IPC interface is based on the WebSocket multiplexing draft spec,
 // http://tools.ietf.org/html/draft-ietf-hybi-websocket-multiplexing-09
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
+#include "content/common/serialized_origin.h"
 #include "content/common/websocket.h"
 #include "ipc/ipc_message_macros.h"
 #include "url/gurl.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 #define IPC_MESSAGE_START WebSocketMsgStart
 
 IPC_ENUM_TRAITS_MAX_VALUE(content::WebSocketMessageType,
                           content::WEB_SOCKET_MESSAGE_TYPE_LAST)
 
 IPC_STRUCT_TRAITS_BEGIN(content::WebSocketHandshakeRequest)
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(headers)
   IPC_STRUCT_TRAITS_MEMBER(request_time)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::WebSocketHandshakeResponse)
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(status_code)
   IPC_STRUCT_TRAITS_MEMBER(status_text)
   IPC_STRUCT_TRAITS_MEMBER(headers)
   IPC_STRUCT_TRAITS_MEMBER(response_time)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(content::SerializedOrigin)
+IPC_STRUCT_TRAITS_MEMBER(string)

[Adam Rice, 2014/02/24 06:48:26]

Indentation.

[yhirano, 2014/03/03 15:41:54]

deleted

+IPC_STRUCT_TRAITS_END()
+
 // WebSocket messages sent from the renderer to the browser.
 
 // Open new virtual WebSocket connection to |socket_url|. |channel_id| is an
 // identifier chosen by the renderer for the new channel. It cannot correspond
 // to an existing open channel, and must be between 1 and
 // 0x7FFFFFFF. |requested_protocols| is a list of tokens identifying
 // sub-protocols the renderer would like to use, as described in RFC6455
 // "Subprotocols Using the WebSocket Protocol".
 //
 // 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_ROUTED3(WebSocketHostMsg_AddChannelRequest,
                     GURL /* socket_url */,
                     std::vector<std::string> /* requested_protocols */,
-                    GURL /* origin */)
+                    content::SerializedOrigin /* origin */)
 
 // WebSocket messages sent from the browser to the renderer.
 
 // Respond to an AddChannelRequest for channel |channel_id|. |channel_id| is
 // scoped to the renderer process; while it is unique per-renderer, the browser
 // may have multiple renderers using the same id. If |fail| is true, the channel
 // could not be established (the cause of the failure is not provided to the
 // renderer in order to limit its ability to abuse WebSockets to perform network
 // probing, etc.). If |fail| is set then the |channel_id| is available for
 // re-use. |selected_protocol| is the sub-protocol the server selected,
@@ skipping 75 matching lines @@
 // closing handshake and the renderer cannot accept any new messages on this
 // connection.
 IPC_MESSAGE_ROUTED3(WebSocketMsg_DropChannel,
                     bool /* was_clean */,
                     unsigned short /* code */,
                     std::string /* reason */)
 
 // Notify the renderer that a closing handshake has been initiated by the
 // server, so that it can set the Javascript readyState to CLOSING.
 IPC_MESSAGE_ROUTED0(WebSocketMsg_NotifyClosing)