| Index: content/child/websocket_bridge.cc
|
| diff --git a/content/child/websocket_bridge.cc b/content/child/websocket_bridge.cc
|
| index 2af6e8ece84e35f3451851b1b67aeb1e6e92be8d..60d330697e0dcf2f19549bf5e5be4b063dccb3b4 100644
|
| --- a/content/child/websocket_bridge.cc
|
| +++ b/content/child/websocket_bridge.cc
|
| @@ -17,7 +17,7 @@
|
| #include "content/common/websocket_messages.h"
|
| #include "ipc/ipc_message.h"
|
| #include "ipc/ipc_message_macros.h"
|
| -#include "third_party/WebKit/public/platform/WebSerializedOrigin.h"
|
| +#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
|
| #include "third_party/WebKit/public/platform/WebSocketHandle.h"
|
| #include "third_party/WebKit/public/platform/WebSocketHandleClient.h"
|
| #include "third_party/WebKit/public/platform/WebSocketHandshakeRequestInfo.h"
|
| @@ -28,7 +28,7 @@
|
| #include "url/gurl.h"
|
| #include "url/origin.h"
|
|
|
| -using blink::WebSerializedOrigin;
|
| +using blink::WebSecurityOrigin;
|
| using blink::WebSocketHandle;
|
| using blink::WebSocketHandleClient;
|
| using blink::WebString;
|
| @@ -203,11 +203,10 @@ void WebSocketBridge::DidStartClosingHandshake() {
|
| // |this| can be deleted here.
|
| }
|
|
|
| -void WebSocketBridge::connect(
|
| - const WebURL& url,
|
| - const WebVector<WebString>& protocols,
|
| - const WebSerializedOrigin& origin,
|
| - WebSocketHandleClient* client) {
|
| +void WebSocketBridge::connect(const WebURL& url,
|
| + const WebVector<WebString>& protocols,
|
| + const WebSecurityOrigin& origin,
|
| + WebSocketHandleClient* client) {
|
| DCHECK_EQ(kInvalidChannelId, channel_id_);
|
| WebSocketDispatcher* dispatcher =
|
| ChildThreadImpl::current()->websocket_dispatcher();
|
| @@ -217,7 +216,7 @@ void WebSocketBridge::connect(
|
| std::vector<std::string> protocols_to_pass;
|
| for (size_t i = 0; i < protocols.size(); ++i)
|
| protocols_to_pass.push_back(protocols[i].utf8());
|
| - url::Origin origin_to_pass(origin);
|
| + url::Origin origin_to_pass(origin.toString().utf8());
|
|
|
| DVLOG(1) << "Bridge#" << channel_id_ << " Connect(" << url << ", ("
|
| << JoinString(protocols_to_pass, ", ") << "), "
|
|
|