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

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

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 357
358 WebSocketStream::ConnectDelegate::~ConnectDelegate() {} 358 WebSocketStream::ConnectDelegate::~ConnectDelegate() {}
359 359
360 std::unique_ptr<WebSocketStreamRequest> WebSocketStream::CreateAndConnectStream( 360 std::unique_ptr<WebSocketStreamRequest> WebSocketStream::CreateAndConnectStream(
361 const GURL& socket_url, 361 const GURL& socket_url,
362 std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper, 362 std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper,
363 const url::Origin& origin, 363 const url::Origin& origin,
364 const GURL& first_party_for_cookies, 364 const GURL& first_party_for_cookies,
365 const std::string& additional_headers, 365 const std::string& additional_headers,
366 URLRequestContext* url_request_context, 366 URLRequestContext* url_request_context,
367 const BoundNetLog& net_log, 367 const NetLogWithSource& net_log,
368 std::unique_ptr<ConnectDelegate> connect_delegate) { 368 std::unique_ptr<ConnectDelegate> connect_delegate) {
369 std::unique_ptr<WebSocketStreamRequestImpl> request( 369 std::unique_ptr<WebSocketStreamRequestImpl> request(
370 new WebSocketStreamRequestImpl( 370 new WebSocketStreamRequestImpl(
371 socket_url, url_request_context, origin, first_party_for_cookies, 371 socket_url, url_request_context, origin, first_party_for_cookies,
372 additional_headers, std::move(connect_delegate), 372 additional_headers, std::move(connect_delegate),
373 std::move(create_helper))); 373 std::move(create_helper)));
374 request->Start(std::unique_ptr<base::Timer>(new base::Timer(false, false))); 374 request->Start(std::unique_ptr<base::Timer>(new base::Timer(false, false)));
375 return std::move(request); 375 return std::move(request);
376 } 376 }
377 377
378 std::unique_ptr<WebSocketStreamRequest> 378 std::unique_ptr<WebSocketStreamRequest>
379 WebSocketStream::CreateAndConnectStreamForTesting( 379 WebSocketStream::CreateAndConnectStreamForTesting(
380 const GURL& socket_url, 380 const GURL& socket_url,
381 std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper, 381 std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper,
382 const url::Origin& origin, 382 const url::Origin& origin,
383 const GURL& first_party_for_cookies, 383 const GURL& first_party_for_cookies,
384 const std::string& additional_headers, 384 const std::string& additional_headers,
385 URLRequestContext* url_request_context, 385 URLRequestContext* url_request_context,
386 const BoundNetLog& net_log, 386 const NetLogWithSource& net_log,
387 std::unique_ptr<WebSocketStream::ConnectDelegate> connect_delegate, 387 std::unique_ptr<WebSocketStream::ConnectDelegate> connect_delegate,
388 std::unique_ptr<base::Timer> timer) { 388 std::unique_ptr<base::Timer> timer) {
389 std::unique_ptr<WebSocketStreamRequestImpl> request( 389 std::unique_ptr<WebSocketStreamRequestImpl> request(
390 new WebSocketStreamRequestImpl( 390 new WebSocketStreamRequestImpl(
391 socket_url, url_request_context, origin, first_party_for_cookies, 391 socket_url, url_request_context, origin, first_party_for_cookies,
392 additional_headers, std::move(connect_delegate), 392 additional_headers, std::move(connect_delegate),
393 std::move(create_helper))); 393 std::move(create_helper)));
394 request->Start(std::move(timer)); 394 request->Start(std::move(timer));
395 return std::move(request); 395 return std::move(request);
396 } 396 }
397 397
398 void WebSocketDispatchOnFinishOpeningHandshake( 398 void WebSocketDispatchOnFinishOpeningHandshake(
399 WebSocketStream::ConnectDelegate* connect_delegate, 399 WebSocketStream::ConnectDelegate* connect_delegate,
400 const GURL& url, 400 const GURL& url,
401 const scoped_refptr<HttpResponseHeaders>& headers, 401 const scoped_refptr<HttpResponseHeaders>& headers,
402 base::Time response_time) { 402 base::Time response_time) {
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