Delete QuicOptional and replace uses with QuicheOptional gfe-relnote: n/a, no functional change PiperOrigin-RevId: 297428254 Change-Id: I8d80ab57a5e0b66be564e5e464490b73a2b2d0cc
diff --git a/quic/core/congestion_control/bbr2_simulator_test.cc b/quic/core/congestion_control/bbr2_simulator_test.cc index e80b5ac..571ba57 100644 --- a/quic/core/congestion_control/bbr2_simulator_test.cc +++ b/quic/core/congestion_control/bbr2_simulator_test.cc
@@ -14,7 +14,6 @@ #include "net/third_party/quiche/src/quic/core/quic_packet_number.h" #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_optional.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/quic_config_peer.h" #include "net/third_party/quiche/src/quic/test_tools/quic_connection_peer.h" @@ -27,6 +26,7 @@ #include "net/third_party/quiche/src/quic/test_tools/simulator/simulator.h" #include "net/third_party/quiche/src/quic/test_tools/simulator/switch.h" #include "net/third_party/quiche/src/quic/test_tools/simulator/traffic_policer.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_optional.h" #include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h" using testing::AllOf; @@ -90,7 +90,7 @@ // Network switch queue capacity, in number of BDPs. float switch_queue_capacity_in_bdp = 2; - QuicOptional<TrafficPolicerParams> sender_policer_params; + quiche::QuicheOptional<TrafficPolicerParams> sender_policer_params; QuicBandwidth BottleneckBandwidth() const { return std::min(local_link.bandwidth, test_link.bandwidth);
diff --git a/quic/core/crypto/certificate_view.cc b/quic/core/crypto/certificate_view.cc index dc95287..6400528 100644 --- a/quic/core/crypto/certificate_view.cc +++ b/quic/core/crypto/certificate_view.cc
@@ -14,7 +14,6 @@ #include "net/third_party/quiche/src/quic/core/crypto/boring_utils.h" #include "net/third_party/quiche/src/quic/platform/api/quic_ip_address.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_optional.h" #include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h" // The literals below were encoded using `ascii2der | xxd -i`. The comments
diff --git a/quic/core/quic_datagram_queue.cc b/quic/core/quic_datagram_queue.cc index 073ee10..22a57cd 100644 --- a/quic/core/quic_datagram_queue.cc +++ b/quic/core/quic_datagram_queue.cc
@@ -12,6 +12,8 @@ namespace quic { +using quiche::QuicheOptional; + constexpr float kExpiryInMinRtts = 1.25; constexpr float kMinPacingWindows = 4; @@ -35,10 +37,10 @@ return MESSAGE_STATUS_BLOCKED; } -QuicOptional<MessageStatus> QuicDatagramQueue::TrySendingNextDatagram() { +QuicheOptional<MessageStatus> QuicDatagramQueue::TrySendingNextDatagram() { RemoveExpiredDatagrams(); if (queue_.empty()) { - return QuicOptional<MessageStatus>(); + return QuicheOptional<MessageStatus>(); } QuicMemSliceSpan span(&queue_.front().datagram); @@ -52,7 +54,7 @@ size_t QuicDatagramQueue::SendDatagrams() { size_t num_datagrams = 0; for (;;) { - QuicOptional<MessageStatus> status = TrySendingNextDatagram(); + QuicheOptional<MessageStatus> status = TrySendingNextDatagram(); if (!status.has_value()) { break; }
diff --git a/quic/core/quic_datagram_queue.h b/quic/core/quic_datagram_queue.h index c52ad7c..ac78ad4 100644 --- a/quic/core/quic_datagram_queue.h +++ b/quic/core/quic_datagram_queue.h
@@ -9,7 +9,7 @@ #include "net/third_party/quiche/src/quic/core/quic_time.h" #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/platform/api/quic_mem_slice.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_optional.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_optional.h" namespace quic { @@ -29,7 +29,7 @@ // Attempts to send a single datagram from the queue. Returns the result of // SendMessage(), or nullopt if there were no unexpired datagrams to send. - QuicOptional<MessageStatus> TrySendingNextDatagram(); + quiche::QuicheOptional<MessageStatus> TrySendingNextDatagram(); // Sends all of the unexpired datagrams until either the connection becomes // write-blocked or the queue is empty. Returns the number of datagrams sent.
diff --git a/quic/core/quic_datagram_queue_test.cc b/quic/core/quic_datagram_queue_test.cc index 06bddd7..34ccccc 100644 --- a/quic/core/quic_datagram_queue_test.cc +++ b/quic/core/quic_datagram_queue_test.cc
@@ -8,15 +8,17 @@ #include "net/third_party/quiche/src/quic/core/quic_time.h" #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/platform/api/quic_mem_slice.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_optional.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/test_tools/quic_test_utils.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_optional.h" #include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h" namespace quic { namespace test { namespace { +using quiche::QuicheOptional; + using testing::_; using testing::ElementsAre; using testing::Return; @@ -73,7 +75,7 @@ // Verify getting write blocked does not remove the datagram from the queue. EXPECT_CALL(*connection_, SendMessage(_, _, _)) .WillOnce(Return(MESSAGE_STATUS_BLOCKED)); - QuicOptional<MessageStatus> status = queue_.TrySendingNextDatagram(); + QuicheOptional<MessageStatus> status = queue_.TrySendingNextDatagram(); ASSERT_TRUE(status.has_value()); EXPECT_EQ(MESSAGE_STATUS_BLOCKED, *status); EXPECT_EQ(1u, queue_.queue_size()); @@ -87,7 +89,7 @@ } TEST_F(QuicDatagramQueueTest, EmptyBuffer) { - QuicOptional<MessageStatus> status = queue_.TrySendingNextDatagram(); + QuicheOptional<MessageStatus> status = queue_.TrySendingNextDatagram(); EXPECT_FALSE(status.has_value()); size_t num_messages = queue_.SendDatagrams();
diff --git a/quic/core/quic_interval_deque.h b/quic/core/quic_interval_deque.h index 8d5f205..d0d8677 100644 --- a/quic/core/quic_interval_deque.h +++ b/quic/core/quic_interval_deque.h
@@ -12,7 +12,7 @@ #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_optional.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_optional.h" namespace quic { @@ -258,7 +258,7 @@ friend class test::QuicIntervalDequePeer; C container_; - QuicOptional<std::size_t> cached_index_; + quiche::QuicheOptional<std::size_t> cached_index_; }; template <class T, class C>
diff --git a/quic/core/quic_stream.cc b/quic/core/quic_stream.cc index 03b7f4c..ca33a0c 100644 --- a/quic/core/quic_stream.cc +++ b/quic/core/quic_stream.cc
@@ -18,6 +18,7 @@ #include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h" #include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h" +using quiche::QuicheOptional; using spdy::SpdyPriority; namespace quic { @@ -279,15 +280,15 @@ namespace { -QuicOptional<QuicFlowController> FlowController(QuicStreamId id, - QuicSession* session, - StreamType type) { +QuicheOptional<QuicFlowController> FlowController(QuicStreamId id, + QuicSession* session, + StreamType type) { if (type == CRYPTO) { // The only QuicStream with a StreamType of CRYPTO is QuicCryptoStream, when // it is using crypto frames instead of stream frames. The QuicCryptoStream // doesn't have any flow control in that case, so we don't create a // QuicFlowController for it. - return QuicOptional<QuicFlowController>(); + return QuicheOptional<QuicFlowController>(); } return QuicFlowController( session, id, @@ -322,7 +323,7 @@ StreamType type, uint64_t stream_bytes_read, bool fin_received, - QuicOptional<QuicFlowController> flow_controller, + QuicheOptional<QuicFlowController> flow_controller, QuicFlowController* connection_flow_controller) : sequencer_(std::move(sequencer)), id_(id),
diff --git a/quic/core/quic_stream.h b/quic/core/quic_stream.h index 57bfede..9efbe50 100644 --- a/quic/core/quic_stream.h +++ b/quic/core/quic_stream.h
@@ -31,8 +31,8 @@ #include "net/third_party/quiche/src/quic/core/stream_delegate_interface.h" #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" #include "net/third_party/quiche/src/quic/platform/api/quic_mem_slice_span.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_optional.h" #include "net/third_party/quiche/src/quic/platform/api/quic_reference_counted.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_optional.h" #include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h" #include "net/third_party/quiche/src/spdy/core/spdy_protocol.h" @@ -431,7 +431,7 @@ StreamType type, uint64_t stream_bytes_read, bool fin_received, - QuicOptional<QuicFlowController> flow_controller, + quiche::QuicheOptional<QuicFlowController> flow_controller, QuicFlowController* connection_flow_controller); // Calls MaybeSendBlocked on the stream's flow controller and the connection @@ -497,7 +497,7 @@ // True if this stream has received a RST_STREAM frame. bool rst_received_; - QuicOptional<QuicFlowController> flow_controller_; + quiche::QuicheOptional<QuicFlowController> flow_controller_; // The connection level flow controller. Not owned. QuicFlowController* connection_flow_controller_;
diff --git a/quic/platform/api/quic_optional.h b/quic/platform/api/quic_optional.h deleted file mode 100644 index 921c3a8..0000000 --- a/quic/platform/api/quic_optional.h +++ /dev/null
@@ -1,17 +0,0 @@ -// Copyright (c) 2019 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. - -#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_OPTIONAL_H_ -#define QUICHE_QUIC_PLATFORM_API_QUIC_OPTIONAL_H_ - -#include "net/quic/platform/impl/quic_optional_impl.h" - -namespace quic { - -template <typename T> -using QuicOptional = QuicOptionalImpl<T>; - -} // namespace quic - -#endif // QUICHE_QUIC_PLATFORM_API_QUIC_OPTIONAL_H_
diff --git a/quic/quic_transport/quic_transport_client_session.cc b/quic/quic_transport/quic_transport_client_session.cc index 132afd5..ae15371 100644 --- a/quic/quic_transport/quic_transport_client_session.cc +++ b/quic/quic_transport/quic_transport_client_session.cc
@@ -20,7 +20,6 @@ #include "net/third_party/quiche/src/quic/core/quic_versions.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_optional.h" #include "net/third_party/quiche/src/quic/quic_transport/quic_transport_protocol.h" #include "net/third_party/quiche/src/quic/quic_transport/quic_transport_stream.h" #include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
diff --git a/quic/quic_transport/quic_transport_client_session.h b/quic/quic_transport/quic_transport_client_session.h index 767b14a..e4cc15d 100644 --- a/quic/quic_transport/quic_transport_client_session.h +++ b/quic/quic_transport/quic_transport_client_session.h
@@ -21,7 +21,6 @@ #include "net/third_party/quiche/src/quic/core/quic_versions.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" #include "net/third_party/quiche/src/quic/platform/api/quic_containers.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_optional.h" #include "net/third_party/quiche/src/quic/quic_transport/quic_transport_protocol.h" #include "net/third_party/quiche/src/quic/quic_transport/quic_transport_session_interface.h" #include "net/third_party/quiche/src/quic/quic_transport/quic_transport_stream.h"
diff --git a/quic/quic_transport/quic_transport_integration_test.cc b/quic/quic_transport/quic_transport_integration_test.cc index 66bddcb..cdc99a6 100644 --- a/quic/quic_transport/quic_transport_integration_test.cc +++ b/quic/quic_transport/quic_transport_integration_test.cc
@@ -18,7 +18,6 @@ #include "net/third_party/quiche/src/quic/core/quic_types.h" #include "net/third_party/quiche/src/quic/core/quic_versions.h" #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" -#include "net/third_party/quiche/src/quic/platform/api/quic_optional.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/quic_transport/quic_transport_client_session.h" #include "net/third_party/quiche/src/quic/quic_transport/quic_transport_server_session.h"