Remove random small differences between internal and Chromium QUIC

R=rch@chromium.org Change-Id: I2888e7487d261ba9fe340fb0c07c1a26dc105b84 Reviewed-on: https://chromium-review.googlesource.com/c/1273814 Reviewed-by: Ryan Hamilton <rch@chromium.org> Commit-Queue: Victor Vasiliev <vasilvv@chromium.org> Cr-Commit-Position: refs/heads/master@{#598584}
FairyWorld · Oct 11, 2018 · cd82289 · cd82289
1 parent 189ff3d
commit cd82289
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 10 deletions.
diff --git a/net/third_party/quic/core/quic_bandwidth.h b/net/third_party/quic/core/quic_bandwidth.h
@@ -12,7 +12,6 @@
 #include <limits>
 #include <ostream>
 
-#include "base/compiler_specific.h"
 #include "net/third_party/quic/core/quic_constants.h"
 #include "net/third_party/quic/core/quic_time.h"
 #include "net/third_party/quic/core/quic_types.h"

diff --git a/net/third_party/quic/core/quic_crypto_client_handshaker.h b/net/third_party/quic/core/quic_crypto_client_handshaker.h
@@ -15,10 +15,6 @@
 
 namespace quic {
 
-namespace test {
-class QuicChromiumClientSessionPeer;
-}  // namespace test
-
 // An implementation of QuicCryptoClientStream::HandshakerDelegate which uses
 // QUIC crypto as the crypto handshake protocol.
 class QUIC_EXPORT_PRIVATE QuicCryptoClientHandshaker
@@ -96,8 +92,6 @@ class QUIC_EXPORT_PRIVATE QuicCryptoClientHandshaker
     QuicCryptoClientHandshaker* parent_;
   };
 
-  friend class test::QuicChromiumClientSessionPeer;
-
   enum State {
     STATE_IDLE,
     STATE_INITIALIZE,

diff --git a/net/third_party/quic/core/quic_packet_reader.cc b/net/third_party/quic/core/quic_packet_reader.cc
@@ -9,7 +9,6 @@
 // This is a GNU header that is not present on Apple platforms
 #include <features.h>
 #endif
-#include <netinet/in.h>
 #include <string.h>
 #include <sys/socket.h>
 

diff --git a/net/third_party/quic/core/quic_session.h b/net/third_party/quic/core/quic_session.h
@@ -12,7 +12,6 @@
 #include <memory>
 #include <vector>
 
-#include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "net/third_party/quic/core/quic_connection.h"
 #include "net/third_party/quic/core/quic_control_frame_manager.h"

diff --git a/net/third_party/quic/core/quic_stream_sequencer.h b/net/third_party/quic/core/quic_stream_sequencer.h
@@ -113,7 +113,7 @@ class QUIC_EXPORT_PRIVATE QuicStreamSequencer {
 
   bool level_triggered() const { return level_triggered_; }
 
-  // Returns std::string describing internal state.
+  // Returns string describing internal state.
   const QuicString DebugString() const;
 
  private: