[ABANDONED] [WebSocket] Remove the trailing slash from the origin header.

net/websockets/websocket_stream.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 "net/websockets/websocket_stream.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_status_code.h"
@@ skipping 128 matching lines @@
 
 void Delegate::OnReadCompleted(URLRequest* request, int bytes_read) {
   NOTREACHED();
 }
 
 // Internal implementation of CreateAndConnectStream and
 // CreateAndConnectStreamForTesting.
 scoped_ptr<WebSocketStreamRequest> CreateAndConnectStreamWithCreateHelper(
     const GURL& socket_url,
     scoped_ptr<WebSocketHandshakeStreamCreateHelper> create_helper,
-    const GURL& origin,
+    const GURL& origin_url,
     URLRequestContext* url_request_context,
     const BoundNetLog& net_log,
     scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate) {
   scoped_ptr<StreamRequestImpl> request(
       new StreamRequestImpl(socket_url,
                             url_request_context,
                             connect_delegate.Pass(),
                             create_helper.get()));
   HttpRequestHeaders headers;
+  std::string origin;
+  if (origin_url.is_valid()) {
+    // GURL::spec() adds a slash at the end of an origin,
+    // so we construct the origin string representation by hand.
+    origin = origin_url.scheme() + "://" + origin_url.host();
+    if (origin_url.has_port())
+      origin += ":" + origin_url.port();
+  } else {
+    origin = "null";
+  }
+
   headers.SetHeader(websockets::kUpgrade, websockets::kWebSocketLowercase);
   headers.SetHeader(HttpRequestHeaders::kConnection, websockets::kUpgrade);
-  headers.SetHeader(HttpRequestHeaders::kOrigin, origin.spec());
+  headers.SetHeader(HttpRequestHeaders::kOrigin, origin);
   // TODO(ricea): Move the version number to websocket_handshake_constants.h
   headers.SetHeader(websockets::kSecWebSocketVersion,
                     websockets::kSupportedVersion);
   request->url_request()->SetExtraRequestHeaders(headers);
   request->url_request()->SetUserData(
       WebSocketHandshakeStreamBase::CreateHelper::DataKey(),
       create_helper.release());
   request->url_request()->SetLoadFlags(LOAD_DISABLE_CACHE |
                                        LOAD_BYPASS_CACHE |
                                        LOAD_DO_NOT_PROMPT_FOR_LOGIN);
@@ skipping 38 matching lines @@
       scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate) {
   return CreateAndConnectStreamWithCreateHelper(socket_url,
                                                 create_helper.Pass(),
                                                 origin,
                                                 url_request_context,
                                                 net_log,
                                                 connect_delegate.Pass());
 }
 
 }  // namespace net