Index: content/child/websocket_bridge.cc |
diff --git a/content/child/websocket_bridge.cc b/content/child/websocket_bridge.cc |
index 7cfff1ad50a942960024e79ac8d98377e363642d..d603fc5a8bb0feb83bb70637f492450bc1fce15f 100644 |
--- a/content/child/websocket_bridge.cc |
+++ b/content/child/websocket_bridge.cc |
@@ -206,6 +206,7 @@ void WebSocketBridge::DidStartClosingHandshake() { |
void WebSocketBridge::connect(const WebURL& url, |
const WebVector<WebString>& protocols, |
const WebSecurityOrigin& origin, |
+ const WebString& user_agent_override, |
WebSocketHandleClient* client) { |
DCHECK_EQ(kInvalidChannelId, channel_id_); |
WebSocketDispatcher* dispatcher = |
@@ -221,8 +222,10 @@ void WebSocketBridge::connect(const WebURL& url, |
<< base::JoinString(protocols_to_pass, ", ") << "), " |
<< origin.toString().utf8() << ")"; |
+ // Headers (ie: User-Agent) are ISO Latin 1. |
ChildThreadImpl::current()->Send(new WebSocketHostMsg_AddChannelRequest( |
- channel_id_, url, protocols_to_pass, origin, render_frame_id_)); |
+ channel_id_, url, protocols_to_pass, origin, |
+ user_agent_override.latin1(), render_frame_id_)); |
} |
void WebSocketBridge::send(bool fin, |