Introduce url::Origin to represent Web Origin.

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.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 "url/gurl.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::WebSocketHandle;
 using blink::WebSocketHandleClient;
 using blink::WebString;
 using blink::WebURL;
 using blink::WebVector;
 
 namespace content {
 
 namespace {
@@ skipping 171 matching lines @@
     WebSocketHandleClient* client) {
   DCHECK_EQ(kInvalidChannelId, channel_id_);
   WebSocketDispatcher* dispatcher =
       ChildThread::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());
-  GURL origin_to_pass(origin.utf8());
+  url::Origin origin_to_pass(origin.utf8());
 
-  DVLOG(1) << "Bridge#" << channel_id_ << " Connect("
-           << url << ", (" << JoinString(protocols_to_pass, ", ") << "), "
-           << origin_to_pass << ")";
+  DVLOG(1) << "Bridge#" << channel_id_ << " Connect(" << url << ", ("
+           << JoinString(protocols_to_pass, ", ") << "), "
+           << origin_to_pass.string() << ")";
 
   ChildThread::current()->Send(
       new WebSocketHostMsg_AddChannelRequest(channel_id_,
                                              url,
                                              protocols_to_pass,
                                              origin_to_pass));
 }
 
 void WebSocketBridge::send(bool fin,
                            WebSocketHandle::MessageType type,
@@ skipping 54 matching lines @@
     return;
   WebSocketDispatcher* dispatcher =
       ChildThread::current()->websocket_dispatcher();
   dispatcher->RemoveBridge(channel_id_);
 
   channel_id_ = kInvalidChannelId;
   client_ = NULL;
 }
 
 }  // namespace content