Revert quic_io modifications

Author: qwu16

quic_io/build-gn.patch

@@ -1,9 +1,9 @@
 diff --git a/net/BUILD.gn b/net/BUILD.gn
-index 1f228f8cd35c..827f6f6649ed 100644
+index c2f0a78..7927d78 100644
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -2635,6 +2635,20 @@ source_set("simple_quic_tools") {
-     "tools/quic/quic_transport_simple_server.h",
+@@ -3326,6 +3326,20 @@ source_set("simple_quic_tools") {
+     "tools/quic/quic_simple_server_session_helper.h",
      "tools/quic/synchronous_host_resolver.cc",
      "tools/quic/synchronous_host_resolver.h",
 +    "tools/quic/raw/quic_raw_stream.cc",
@@ -23,7 +23,7 @@ index 1f228f8cd35c..827f6f6649ed 100644
    ]
    deps = [
      ":net",
-@@ -2650,6 +2664,22 @@ source_set("simple_quic_tools") {
+@@ -3337,6 +3351,22 @@ source_set("simple_quic_tools") {
  }
 
  if (!is_ios) {
@@ -44,5 +44,5 @@ index 1f228f8cd35c..827f6f6649ed 100644
 +    ]
 +  }
    executable("quic_client") {
-     testonly = true
-     sources = [ "tools/quic/quic_simple_client_bin.cc" ]
+     sources = [
+       "tools/quic/quic_simple_client_bin.cc",

quic_io/src/quic_raw_client.cc

@@ -6,28 +6,23 @@
 
 #include <utility>
 
-#include "base/memory/ptr_util.h"
+#include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/net_errors.h"
-#include "net/http/http_request_info.h"
-#include "net/http/http_response_info.h"
 #include "net/log/net_log_source.h"
 #include "net/log/net_log_with_source.h"
 #include "net/quic/quic_chromium_alarm_factory.h"
 #include "net/quic/quic_chromium_connection_helper.h"
 #include "net/quic/quic_chromium_packet_reader.h"
 #include "net/quic/quic_chromium_packet_writer.h"
 #include "net/socket/udp_client_socket.h"
-#include "net/spdy/spdy_http_utils.h"
-#include "net/third_party/quiche/src/quic/core/crypto/quic_random.h"
-#include "net/third_party/quiche/src/quic/core/http/spdy_utils.h"
-#include "net/third_party/quiche/src/quic/core/quic_connection.h"
-#include "net/third_party/quiche/src/quic/core/quic_packets.h"
-#include "net/third_party/quiche/src/quic/core/quic_server_id.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_flags.h"
-#include "net/third_party/quiche/src/quic/tools/quic_simple_client_session.h"
-#include "net/third_party/quiche/src/spdy/core/spdy_header_block.h"
+#include "net/third_party/quic/core/crypto/quic_random.h"
+#include "net/third_party/quic/core/quic_connection.h"
+#include "net/third_party/quic/core/quic_packets.h"
+#include "net/third_party/quic/core/quic_server_id.h"
+#include "net/third_party/quic/platform/api/quic_flags.h"
+#include "net/third_party/quic/platform/api/quic_ptr_util.h"
 
 using std::string;
 
@@ -44,9 +39,8 @@ QuicRawClient::QuicRawClient(
           quic::QuicConfig(),
           CreateQuicConnectionHelper(),
           CreateQuicAlarmFactory(),
-          base::WrapUnique(CreateNetworkHelper()),
-          std::move(proof_verifier),
-          nullptr),
+          quic::QuicWrapUnique(CreateNetworkHelper()),
+          std::move(proof_verifier)),
       weak_factory_(this) {
   set_server_address(server_address);
 }

quic_io/src/quic_raw_client.h

@@ -12,15 +12,15 @@
 #include "base/macros.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
-#include "net/http/http_response_headers.h"
 #include "net/log/net_log.h"
-#include "net/quic/platform/impl/quic_chromium_clock.h"
 #include "net/quic/quic_chromium_packet_reader.h"
-#include "net/third_party/quiche/src/quic/core/http/quic_spdy_stream.h"
-#include "net/third_party/quiche/src/quic/core/quic_config.h"
+#include "net/third_party/quic/core/quic_config.h"
+#include "net/third_party/quic/platform/impl/quic_chromium_clock.h"
 #include "net/tools/quic/quic_client_message_loop_network_helper.h"
 
 #include "net/tools/quic/raw/quic_raw_client_base.h"
+#include "net/tools/quic/raw/quic_raw_stream.h"
+
 
 namespace net {
 

quic_io/src/quic_raw_client_base.cc

@@ -4,12 +4,14 @@
 
 #include "net/tools/quic/raw/quic_raw_client_base.h"
 
-#include "net/third_party/quiche/src/quic/core/crypto/quic_random.h"
-#include "net/third_party/quiche/src/quic/core/quic_server_id.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_flags.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_logging.h"
+#include "net/third_party/quic/core/crypto/quic_random.h"
+#include "net/third_party/quic/core/quic_server_id.h"
+#include "net/third_party/quic/platform/api/quic_flags.h"
+#include "net/third_party/quic/platform/api/quic_logging.h"
+#include "net/third_party/quic/platform/api/quic_ptr_util.h"
+#include "net/third_party/quic/platform/api/quic_text_utils.h"
 
-using std::string;
+using base::StringToInt;
 
 namespace quic {
 
@@ -20,16 +22,14 @@ QuicRawClientBase::QuicRawClientBase(
     QuicConnectionHelperInterface* helper,
     QuicAlarmFactory* alarm_factory,
     std::unique_ptr<NetworkHelper> network_helper,
-    std::unique_ptr<ProofVerifier> proof_verifier,
-    std::unique_ptr<SessionCache> session_cache)
+    std::unique_ptr<ProofVerifier> proof_verifier)
     : QuicClientBase(server_id,
                      supported_versions,
                      config,
                      helper,
                      alarm_factory,
                      std::move(network_helper),
-                     std::move(proof_verifier),
-                     std::move(session_cache)) {}
+                     std::move(proof_verifier)) {}
 
 QuicRawClientBase::~QuicRawClientBase() {
   // If we own something. We need to explicitly kill
@@ -57,7 +57,7 @@ void QuicRawClientBase::OnData(QuicRawStream* stream, char* data, size_t len) {
 std::unique_ptr<QuicSession> QuicRawClientBase::CreateQuicClientSession(
     const quic::ParsedQuicVersionVector& supported_versions,
     QuicConnection* connection) {
-  return std::make_unique<QuicRawClientSession>(
+  return QuicMakeUnique<QuicRawClientSession>(
       connection, nullptr, *config(), supported_versions, server_id(),
       crypto_config());
 }
@@ -71,19 +71,12 @@ QuicRawStream* QuicRawClientBase::CreateClientStream() {
   auto* stream = static_cast<QuicRawStream*>(
       client_session()->CreateOutgoingBidirectionalStream());
   if (stream) {
+    stream->SetPriority(QuicStream::kDefaultPriority);
     stream->set_visitor(this);
   }
   return stream;
 }
 
-bool QuicRawClientBase::EarlyDataAccepted() {
-  return client_session()->EarlyDataAccepted();
-}
-
-bool QuicRawClientBase::ReceivedInchoateReject() {
-  return client_session()->ReceivedInchoateReject();
-}
-
 int QuicRawClientBase::GetNumSentClientHellosFromSession() {
   return client_session()->GetNumSentClientHellos();
 }
@@ -92,8 +85,4 @@ int QuicRawClientBase::GetNumReceivedServerConfigUpdatesFromSession() {
   return client_session()->GetNumReceivedServerConfigUpdates();
 }
 
-bool QuicRawClientBase::HasActiveRequests() {
-  return client_session()->HasActiveRequestStreams();
-}
-
 }  // namespace quic

quic_io/src/quic_raw_client_base.h

@@ -11,13 +11,14 @@
 #include <string>
 
 #include "base/macros.h"
-#include "net/third_party/quiche/src/quic/core/crypto/crypto_handshake.h"
-#include "net/third_party/quiche/src/quic/core/quic_config.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h"
-#include "net/third_party/quiche/src/quic/tools/quic_client_base.h"
+#include "net/third_party/quic/core/crypto/crypto_handshake.h"
+#include "net/third_party/quic/core/quic_config.h"
+#include "net/third_party/quic/platform/api/quic_socket_address.h"
+#include "net/third_party/quic/platform/api/quic_string_piece.h"
+#include "net/third_party/quic/tools/quic_client_base.h"
 
-#include "net/tools/quic/raw/quic_raw_client_session.h"
 #include "net/tools/quic/raw/quic_raw_stream.h"
+#include "net/tools/quic/raw/quic_raw_client_session.h"
 
 
 namespace quic {
@@ -34,8 +35,7 @@ class QuicRawClientBase : public QuicClientBase,
                      QuicConnectionHelperInterface* helper,
                      QuicAlarmFactory* alarm_factory,
                      std::unique_ptr<NetworkHelper> network_helper,
-                     std::unique_ptr<ProofVerifier> proof_verifier,
-                     std::unique_ptr<SessionCache> session_cache);
+                     std::unique_ptr<ProofVerifier> proof_verifier);
   QuicRawClientBase(const QuicRawClientBase&) = delete;
   QuicRawClientBase& operator=(const QuicRawClientBase&) = delete;
 
@@ -64,9 +64,6 @@ class QuicRawClientBase : public QuicClientBase,
  protected:
   int GetNumSentClientHellosFromSession() override;
   int GetNumReceivedServerConfigUpdatesFromSession() override;
-  bool EarlyDataAccepted() override;
-  bool ReceivedInchoateReject() override;
-  bool HasActiveRequests() override;
 
   // Takes ownership of |connection|.
   std::unique_ptr<QuicSession> CreateQuicClientSession(

quic_io/src/quic_raw_client_session.cc

@@ -3,13 +3,14 @@
 
 #include <string>
 
-#include "net/third_party/quiche/src/quic/core/crypto/crypto_protocol.h"
-#include "net/third_party/quiche/src/quic/core/quic_server_id.h"
-#include "net/third_party/quiche/src/quic/core/quic_utils.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_flag_utils.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_flags.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_logging.h"
+#include "net/third_party/quic/core/crypto/crypto_protocol.h"
+#include "net/third_party/quic/core/quic_server_id.h"
+#include "net/third_party/quic/core/quic_utils.h"
+#include "net/third_party/quic/platform/api/quic_bug_tracker.h"
+#include "net/third_party/quic/platform/api/quic_flag_utils.h"
+#include "net/third_party/quic/platform/api/quic_flags.h"
+#include "net/third_party/quic/platform/api/quic_logging.h"
+#include "net/third_party/quic/platform/api/quic_ptr_util.h"
 
 namespace quic {
 
@@ -20,7 +21,7 @@ QuicRawClientSession::QuicRawClientSession(
     const ParsedQuicVersionVector& supported_versions,
     const QuicServerId& server_id,
     QuicCryptoClientConfig* crypto_config)
-    : QuicSession(connection, visitor, config, supported_versions, 0u),
+    : QuicSession(connection, visitor, config, supported_versions),
       server_id_(server_id),
       crypto_config_(crypto_config),
       respect_goaway_(false) {}
@@ -69,7 +70,7 @@ bool QuicRawClientSession::ShouldCreateOutgoingBidirectionalStream() {
 }
 
 bool QuicRawClientSession::ShouldCreateOutgoingUnidirectionalStream() {
-  QUIC_BUG(quic_bug_10396_1) << "Try to create outgoing unidirectional client data streams";
+  QUIC_BUG << "Try to create outgoing unidirectional client data streams";
   return false;
 }
 
@@ -86,15 +87,15 @@ QuicRawClientSession::CreateOutgoingBidirectionalStream() {
 
 QuicRawStream*
 QuicRawClientSession::CreateOutgoingUnidirectionalStream() {
-  QUIC_BUG(quic_bug_10396_2) << "Try to create outgoing unidirectional client data streams";
+  QUIC_BUG << "Try to create outgoing unidirectional client data streams";
   return nullptr;
 }
 
 std::unique_ptr<QuicRawStream>
 QuicRawClientSession::CreateClientStream() {
     //GetNextOutgoingBidirectionalStreamId
-  return std::make_unique<QuicRawStream>(
-      GetNextOutgoingBidirectionalStreamId(), this, BIDIRECTIONAL);
+  return QuicMakeUnique<QuicRawStream>(
+      GetNextOutgoingStreamId(), this, BIDIRECTIONAL);
 }
 
 QuicCryptoClientStreamBase* QuicRawClientSession::GetMutableCryptoStream() {
@@ -119,20 +120,12 @@ int QuicRawClientSession::GetNumReceivedServerConfigUpdates() const {
   return crypto_stream_->num_scup_messages_received();
 }
 
-bool QuicRawClientSession::EarlyDataAccepted() const {
-  return crypto_stream_->EarlyDataAccepted();
-}
-
-bool QuicRawClientSession::ReceivedInchoateReject() const {
-  return crypto_stream_->ReceivedInchoateReject();
-}
-
 bool QuicRawClientSession::ShouldCreateIncomingStream(QuicStreamId id) {
   if (!connection()->connected()) {
-    QUIC_BUG(quic_bug_10396_3) << "ShouldCreateIncomingStream called when disconnected";
+    QUIC_BUG << "ShouldCreateIncomingStream called when disconnected";
     return false;
   }
-  if (transport_goaway_received() && respect_goaway_) {
+  if (goaway_received() && respect_goaway_) {
     QUIC_DLOG(INFO) << "Failed to create a new outgoing stream. "
                     << "Already received goaway.";
     return false;
@@ -151,14 +144,6 @@ bool QuicRawClientSession::ShouldCreateIncomingStream(QuicStreamId id) {
   return true;
 }
 
-QuicRawStream* QuicRawClientSession::CreateIncomingStream(
-    PendingStream* pending) {
-  QuicRawStream* stream =
-      new QuicRawStream(pending, this, READ_UNIDIRECTIONAL);
-  ActivateStream(absl::WrapUnique(stream));
-  return stream;
-}
-
 // QuicRawStream* QuicRawClientSession::CreateIncomingStream(
 //     PendingStream pending) {
 //   QuicRawStream* stream =
@@ -173,30 +158,25 @@ QuicRawStream* QuicRawClientSession::CreateIncomingStream(QuicStreamId id) {
   }
   QuicRawStream* stream =
       new QuicRawStream(id, this, READ_UNIDIRECTIONAL);
-  ActivateStream(absl::WrapUnique(stream));
+  ActivateStream(QuicWrapUnique(stream));
   return stream;
 }
 
 std::unique_ptr<QuicCryptoClientStreamBase>
 QuicRawClientSession::CreateQuicCryptoStream() {
-  return std::make_unique<QuicCryptoClientStream>(
+  return QuicMakeUnique<QuicCryptoClientStream>(
       server_id_, this,
       crypto_config_->proof_verifier()->CreateDefaultContext(), crypto_config_,
-      this, /*has_application_state = */ false);
+      this);
 }
 
 void QuicRawClientSession::OnConfigNegotiated() {
   QuicSession::OnConfigNegotiated();
 }
 
-bool QuicRawClientSession::HasActiveRequestStreams() const {
-  return GetNumActiveStreams() + num_draining_streams() > 0;
-}
-
-bool QuicRawClientSession::ShouldKeepConnectionAlive() const {
-  QUICHE_DCHECK(VersionUsesHttp3(transport_version()) ||
-                0u == pending_streams_size());
-  return GetNumActiveStreams() + pending_streams_size() > 0;
+void QuicRawClientSession::OnCryptoHandshakeEvent(
+    CryptoHandshakeEvent event) {
+  QuicSession::OnCryptoHandshakeEvent(event);
 }
 
 }  // namespace quic