Remove 'blink::WebSerializedOrigin' (4/5)

components/html_viewer/web_socket_handle_impl.cc

 // Copyright 2014 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.
 
 #include "components/html_viewer/web_socket_handle_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "components/html_viewer/blink_basic_type_converters.h"
 #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;
 using blink::WebURL;
 using blink::WebVector;
 
 using mojo::ConvertTo;
 using mojo::String;
 using mojo::WebSocket;
 using mojo::WebSocketReadQueue;
@@ skipping 122 matching lines @@
 WebSocketHandleImpl::~WebSocketHandleImpl() {
   if (!did_close_) {
     // The connection is abruptly disconnected by the renderer without
     // closing handshake.
     web_socket_->Close(WebSocket::kAbnormalCloseCode, String());
   }
 }
 
 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_|?
   mojo::WebSocketClientPtr client_ptr;
   mojo::MessagePipe pipe;
   client_ptr.Bind(
       mojo::InterfacePtrInfo<mojo::WebSocketClient>(pipe.handle0.Pass(), 0u));
   mojo::InterfaceRequest<mojo::WebSocketClient> request;
   request.Bind(pipe.handle1.Pass());
   client_.reset(new WebSocketClientImpl(this, client, request.Pass()));
 
   mojo::DataPipe data_pipe;
   send_stream_ = data_pipe.producer_handle.Pass();
   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,
                                WebSocketHandle::MessageType type,
                                const char* data,
                                size_t size) {
   if (!client_)
     return;
 
   uint32_t size32 = static_cast<uint32_t>(size);
@@ skipping 22 matching lines @@
     const char* data) {
   web_socket_->Send(fin, ConvertTo<WebSocket::MessageType>(type), num_bytes);
 }
 
 void WebSocketHandleImpl::Disconnect() {
   did_close_ = true;
   client_.reset();
 }
 
 }  // namespace html_viewer