Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Side by Side Diff: net/websockets/websocket_stream.cc

Issue 2405483002: Make the request initiator Optional (Closed)
Patch Set: Introduce NullableOrigin to use for request initiator Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/websockets/websocket_stream.h" 5 #include "net/websockets/websocket_stream.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 HttpRequestHeaders headers; 100 HttpRequestHeaders headers;
101 headers.SetHeader(websockets::kUpgrade, websockets::kWebSocketLowercase); 101 headers.SetHeader(websockets::kUpgrade, websockets::kWebSocketLowercase);
102 headers.SetHeader(HttpRequestHeaders::kConnection, websockets::kUpgrade); 102 headers.SetHeader(HttpRequestHeaders::kConnection, websockets::kUpgrade);
103 headers.SetHeader(HttpRequestHeaders::kOrigin, origin.Serialize()); 103 headers.SetHeader(HttpRequestHeaders::kOrigin, origin.Serialize());
104 headers.SetHeader(websockets::kSecWebSocketVersion, 104 headers.SetHeader(websockets::kSecWebSocketVersion,
105 websockets::kSupportedVersion); 105 websockets::kSupportedVersion);
106 106
107 headers.AddHeadersFromString(additional_headers); 107 headers.AddHeadersFromString(additional_headers);
108 108
109 url_request_->SetExtraRequestHeaders(headers); 109 url_request_->SetExtraRequestHeaders(headers);
110 url_request_->set_initiator(origin); 110 url_request_->set_initiator(new url::NullableOrigin(origin));
111 url_request_->set_first_party_for_cookies(first_party_for_cookies); 111 url_request_->set_first_party_for_cookies(first_party_for_cookies);
112 112
113 // This passes the ownership of |handshake_stream_create_helper_| to 113 // This passes the ownership of |handshake_stream_create_helper_| to
114 // |url_request_|. 114 // |url_request_|.
115 url_request_->SetUserData( 115 url_request_->SetUserData(
116 WebSocketHandshakeStreamBase::CreateHelper::DataKey(), 116 WebSocketHandshakeStreamBase::CreateHelper::DataKey(),
117 handshake_stream_create_helper_); 117 handshake_stream_create_helper_);
118 url_request_->SetLoadFlags(LOAD_DISABLE_CACHE | LOAD_BYPASS_CACHE); 118 url_request_->SetLoadFlags(LOAD_DISABLE_CACHE | LOAD_BYPASS_CACHE);
119 } 119 }
120 120
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 DCHECK(connect_delegate); 403 DCHECK(connect_delegate);
404 if (headers.get()) { 404 if (headers.get()) {
405 connect_delegate->OnFinishOpeningHandshake( 405 connect_delegate->OnFinishOpeningHandshake(
406 base::MakeUnique<WebSocketHandshakeResponseInfo>( 406 base::MakeUnique<WebSocketHandshakeResponseInfo>(
407 url, headers->response_code(), headers->GetStatusText(), headers, 407 url, headers->response_code(), headers->GetStatusText(), headers,
408 response_time)); 408 response_time));
409 } 409 }
410 } 410 }
411 411
412 } // namespace net 412 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698