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

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

Issue 2102993002: Fix WebSocket to set first party for cookies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update testRunner calls to setBlockThirdPartyCookies() Created 4 years, 5 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_create_test_base.h" 5 #include "net/websockets/websocket_stream_create_test_base.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 }; 91 };
92 92
93 WebSocketStreamCreateTestBase::WebSocketStreamCreateTestBase() 93 WebSocketStreamCreateTestBase::WebSocketStreamCreateTestBase()
94 : has_failed_(false), ssl_fatal_(false) { 94 : has_failed_(false), ssl_fatal_(false) {
95 } 95 }
96 96
97 WebSocketStreamCreateTestBase::~WebSocketStreamCreateTestBase() { 97 WebSocketStreamCreateTestBase::~WebSocketStreamCreateTestBase() {
98 } 98 }
99 99
100 void WebSocketStreamCreateTestBase::CreateAndConnectStream( 100 void WebSocketStreamCreateTestBase::CreateAndConnectStream(
101 const std::string& socket_url, 101 const GURL& socket_url,
102 const std::vector<std::string>& sub_protocols, 102 const std::vector<std::string>& sub_protocols,
103 const url::Origin& origin, 103 const url::Origin& origin,
104 const GURL& first_party_for_cookies,
104 const std::string& additional_headers, 105 const std::string& additional_headers,
105 std::unique_ptr<base::Timer> timer) { 106 std::unique_ptr<base::Timer> timer) {
106 for (size_t i = 0; i < ssl_data_.size(); ++i) { 107 for (size_t i = 0; i < ssl_data_.size(); ++i) {
107 url_request_context_host_.AddSSLSocketDataProvider(std::move(ssl_data_[i])); 108 url_request_context_host_.AddSSLSocketDataProvider(std::move(ssl_data_[i]));
108 } 109 }
109 ssl_data_.clear(); 110 ssl_data_.clear();
110 std::unique_ptr<WebSocketStream::ConnectDelegate> connect_delegate( 111 std::unique_ptr<WebSocketStream::ConnectDelegate> connect_delegate(
111 new TestConnectDelegate(this, connect_run_loop_.QuitClosure())); 112 new TestConnectDelegate(this, connect_run_loop_.QuitClosure()));
112 WebSocketStream::ConnectDelegate* delegate = connect_delegate.get(); 113 WebSocketStream::ConnectDelegate* delegate = connect_delegate.get();
113 std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper( 114 std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper(
114 new DeterministicKeyWebSocketHandshakeStreamCreateHelper(delegate, 115 new DeterministicKeyWebSocketHandshakeStreamCreateHelper(delegate,
115 sub_protocols)); 116 sub_protocols));
116 stream_request_ = CreateAndConnectStreamForTesting( 117 stream_request_ = CreateAndConnectStreamForTesting(
117 GURL(socket_url), std::move(create_helper), origin, additional_headers, 118 socket_url, std::move(create_helper), origin, first_party_for_cookies,
118 url_request_context_host_.GetURLRequestContext(), BoundNetLog(), 119 additional_headers, url_request_context_host_.GetURLRequestContext(),
119 std::move(connect_delegate), 120 BoundNetLog(), std::move(connect_delegate),
120 timer ? std::move(timer) 121 timer ? std::move(timer)
121 : std::unique_ptr<base::Timer>(new base::Timer(false, false))); 122 : std::unique_ptr<base::Timer>(new base::Timer(false, false)));
122 } 123 }
123 124
124 std::vector<HeaderKeyValuePair> 125 std::vector<HeaderKeyValuePair>
125 WebSocketStreamCreateTestBase::RequestHeadersToVector( 126 WebSocketStreamCreateTestBase::RequestHeadersToVector(
126 const HttpRequestHeaders& headers) { 127 const HttpRequestHeaders& headers) {
127 HttpRequestHeaders::Iterator it(headers); 128 HttpRequestHeaders::Iterator it(headers);
128 std::vector<HeaderKeyValuePair> result; 129 std::vector<HeaderKeyValuePair> result;
129 while (it.GetNext()) 130 while (it.GetNext())
(...skipping 14 matching lines...) Expand all
144 145
145 void WebSocketStreamCreateTestBase::WaitUntilConnectDone() { 146 void WebSocketStreamCreateTestBase::WaitUntilConnectDone() {
146 connect_run_loop_.Run(); 147 connect_run_loop_.Run();
147 } 148 }
148 149
149 std::vector<std::string> WebSocketStreamCreateTestBase::NoSubProtocols() { 150 std::vector<std::string> WebSocketStreamCreateTestBase::NoSubProtocols() {
150 return std::vector<std::string>(); 151 return std::vector<std::string>();
151 } 152 }
152 153
153 } // namespace net 154 } // namespace net
OLDNEW
« no previous file with comments | « net/websockets/websocket_stream_create_test_base.h ('k') | net/websockets/websocket_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698