| Index: components/html_viewer/web_socket_handle_impl.cc
|
| diff --git a/components/html_viewer/web_socket_handle_impl.cc b/components/html_viewer/web_socket_handle_impl.cc
|
| index b5ea28a1380190f0ed6b36a846325e873f31bfbf..b062c77460d4a23af6c0c6d90bce3522b83dac77 100644
|
| --- a/components/html_viewer/web_socket_handle_impl.cc
|
| +++ b/components/html_viewer/web_socket_handle_impl.cc
|
| @@ -13,13 +13,13 @@
|
| #include "mojo/services/network/public/cpp/web_socket_read_queue.h"
|
| #include "mojo/services/network/public/cpp/web_socket_write_queue.h"
|
| #include "mojo/services/network/public/interfaces/network_service.mojom.h"
|
| -#include "third_party/WebKit/public/platform/WebSerializedOrigin.h"
|
| +#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
|
| #include "third_party/WebKit/public/platform/WebSocketHandleClient.h"
|
| #include "third_party/WebKit/public/platform/WebString.h"
|
| #include "third_party/WebKit/public/platform/WebURL.h"
|
| #include "third_party/WebKit/public/platform/WebVector.h"
|
|
|
| -using blink::WebSerializedOrigin;
|
| +using blink::WebSecurityOrigin;
|
| using blink::WebSocketHandle;
|
| using blink::WebSocketHandleClient;
|
| using blink::WebString;
|
| @@ -162,7 +162,7 @@ WebSocketHandleImpl::~WebSocketHandleImpl() {
|
|
|
| void WebSocketHandleImpl::connect(const WebURL& url,
|
| const WebVector<WebString>& protocols,
|
| - const WebSerializedOrigin& origin,
|
| + const WebSecurityOrigin& origin,
|
| WebSocketHandleClient* client) {
|
| // TODO(mpcomplete): Is this the right ownership model? Or should mojo own
|
| // |client_|?
|
| @@ -179,8 +179,8 @@ void WebSocketHandleImpl::connect(const WebURL& url,
|
| write_queue_.reset(new mojo::WebSocketWriteQueue(send_stream_.get()));
|
| web_socket_->Connect(url.string().utf8(),
|
| mojo::Array<String>::From(protocols),
|
| - origin.string().utf8(), data_pipe.consumer_handle.Pass(),
|
| - client_ptr.Pass());
|
| + origin.toString().utf8(),
|
| + data_pipe.consumer_handle.Pass(), client_ptr.Pass());
|
| }
|
|
|
| void WebSocketHandleImpl::send(bool fin,
|
|
|