commit 15db688e2ff3518361ffde3808b70c3d2b100fe6
author dmcardle <dmcardle@google.com> Wed Feb 26 12:55:36 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Feb 26 12:56:06 2020 -0800
tree 6350aa6daf6d81889b162c32e4d80f0a82eb8f75
parent 244d5400ec1586913423a432deacc6d4cc5be09b

Delete QuicOptional and replace uses with QuicheOptional

gfe-relnote: n/a, no functional change
PiperOrigin-RevId: 297428254
Change-Id: I8d80ab57a5e0b66be564e5e464490b73a2b2d0cc

quic/core/quic_stream.h

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_;