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

Side by Side Diff: net/quic/quic_crypto_client_stream.cc

Issue 872483002: Changed verify_details_ check to verify_details_.get() to keep code in (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Removing_an_obselete_TODO_84372263
Patch Set: Created 5 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/quic/quic_crypto_client_stream.h" 5 #include "net/quic/quic_crypto_client_stream.h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "base/profiler/scoped_tracker.h" 8 #include "base/profiler/scoped_tracker.h"
9 #include "net/quic/crypto/crypto_protocol.h" 9 #include "net/quic/crypto/crypto_protocol.h"
10 #include "net/quic/crypto/crypto_utils.h" 10 #include "net/quic/crypto/crypto_utils.h"
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 432
433 void QuicCryptoClientStream::DoVerifyProofComplete( 433 void QuicCryptoClientStream::DoVerifyProofComplete(
434 QuicCryptoClientConfig::CachedState* cached) { 434 QuicCryptoClientConfig::CachedState* cached) {
435 // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed. 435 // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
436 tracked_objects::ScopedTracker tracking_profile( 436 tracked_objects::ScopedTracker tracking_profile(
437 FROM_HERE_WITH_EXPLICIT_FUNCTION( 437 FROM_HERE_WITH_EXPLICIT_FUNCTION(
438 "422516 QuicCryptoClientStream::DoVerifyProofComplete")); 438 "422516 QuicCryptoClientStream::DoVerifyProofComplete"));
439 439
440 if (!verify_ok_) { 440 if (!verify_ok_) {
441 next_state_ = STATE_NONE; 441 next_state_ = STATE_NONE;
442 if (verify_details_) { 442 if (verify_details_.get()) {
443 client_session()->OnProofVerifyDetailsAvailable(*verify_details_); 443 client_session()->OnProofVerifyDetailsAvailable(*verify_details_);
444 } 444 }
445 UMA_HISTOGRAM_BOOLEAN("Net.QuicVerifyProofFailed.HandshakeConfirmed", 445 UMA_HISTOGRAM_BOOLEAN("Net.QuicVerifyProofFailed.HandshakeConfirmed",
446 handshake_confirmed()); 446 handshake_confirmed());
447 CloseConnectionWithDetails( 447 CloseConnectionWithDetails(
448 QUIC_PROOF_INVALID, "Proof invalid: " + verify_error_details_); 448 QUIC_PROOF_INVALID, "Proof invalid: " + verify_error_details_);
449 return; 449 return;
450 } 450 }
451 451
452 // Check if generation_counter has changed between STATE_VERIFY_PROOF and 452 // Check if generation_counter has changed between STATE_VERIFY_PROOF and
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 } 647 }
648 } 648 }
649 return false; 649 return false;
650 } 650 }
651 651
652 QuicClientSessionBase* QuicCryptoClientStream::client_session() { 652 QuicClientSessionBase* QuicCryptoClientStream::client_session() {
653 return reinterpret_cast<QuicClientSessionBase*>(session()); 653 return reinterpret_cast<QuicClientSessionBase*>(session());
654 } 654 }
655 655
656 } // namespace net 656 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698