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

content/child/websocket_bridge.cc

 // 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.
 
 #include "content/child/websocket_bridge.h"
 
 #include <stdint.h>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "content/child/child_thread_impl.h"
 #include "content/child/websocket_dispatcher.h"
 #include "content/common/websocket.h"
 #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"
 #include "third_party/WebKit/public/platform/WebSocketHandshakeResponseInfo.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"
 #include "url/gurl.h"
 #include "url/origin.h"
 
-using blink::WebSerializedOrigin;
+using blink::WebSecurityOrigin;
 using blink::WebSocketHandle;
 using blink::WebSocketHandleClient;
 using blink::WebString;
 using blink::WebURL;
 using blink::WebVector;
 
 namespace content {
 
 namespace {
 
@@ skipping 154 matching lines @@
 
 void WebSocketBridge::DidStartClosingHandshake() {
   DVLOG(1) << "WebSocketBridge::DidStartClosingHandshake()";
   if (!client_)
     return;
 
   client_->didStartClosingHandshake(this);
   // |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();
   channel_id_ = dispatcher->AddBridge(this);
   client_ = client;
 
   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, ", ") << "), "
            << origin_to_pass.string() << ")";
 
   ChildThreadImpl::current()->Send(new WebSocketHostMsg_AddChannelRequest(
       channel_id_, url, protocols_to_pass, origin_to_pass, render_frame_id_));
 }
 
 void WebSocketBridge::send(bool fin,
@@ skipping 55 matching lines @@
     return;
   WebSocketDispatcher* dispatcher =
       ChildThreadImpl::current()->websocket_dispatcher();
   dispatcher->RemoveBridge(channel_id_);
 
   channel_id_ = kInvalidChannelId;
   client_ = NULL;
 }
 
 }  // namespace content