Remove SpdyInlinedVector from platform. Inline absl implementation for SpdyInlinedVector (no pun intended). PiperOrigin-RevId: 366302072 Change-Id: Ib4a374f70f3c28785e980ebe30bcabaec0829936
diff --git a/spdy/core/hpack/hpack_header_table.cc b/spdy/core/hpack/hpack_header_table.cc index 43e75e2..15c564e 100644 --- a/spdy/core/hpack/hpack_header_table.cc +++ b/spdy/core/hpack/hpack_header_table.cc
@@ -8,7 +8,6 @@ #include "spdy/core/hpack/hpack_constants.h" #include "spdy/core/hpack/hpack_static_table.h" -#include "spdy/platform/api/spdy_containers.h" #include "spdy/platform/api/spdy_estimate_memory_usage.h" #include "spdy/platform/api/spdy_logging.h"
diff --git a/spdy/core/hpack/hpack_header_table.h b/spdy/core/hpack/hpack_header_table.h index 1030411..893aaa7 100644 --- a/spdy/core/hpack/hpack_header_table.h +++ b/spdy/core/hpack/hpack_header_table.h
@@ -17,7 +17,6 @@ #include "absl/strings/string_view.h" #include "common/platform/api/quiche_export.h" #include "spdy/core/hpack/hpack_entry.h" -#include "spdy/platform/api/spdy_containers.h" // All section references below are to http://tools.ietf.org/html/rfc7541.
diff --git a/spdy/core/http2_priority_write_scheduler.h b/spdy/core/http2_priority_write_scheduler.h index edd6783..5820145 100644 --- a/spdy/core/http2_priority_write_scheduler.h +++ b/spdy/core/http2_priority_write_scheduler.h
@@ -82,7 +82,7 @@ friend class test::Http2PriorityWriteSchedulerPeer<StreamIdType>; struct StreamInfo; - typedef SpdyInlinedVector<StreamInfo*, 4> StreamInfoVector; + using StreamInfoVector = absl::InlinedVector<StreamInfo*, 4>; struct StreamInfo : public SpdyIntrusiveLink<StreamInfo> { // ID for this stream.
diff --git a/spdy/core/lifo_write_scheduler.h b/spdy/core/lifo_write_scheduler.h index a5aa0b5..6903bbf 100644 --- a/spdy/core/lifo_write_scheduler.h +++ b/spdy/core/lifo_write_scheduler.h
@@ -12,7 +12,6 @@ #include "absl/strings/str_cat.h" #include "spdy/core/write_scheduler.h" -#include "spdy/platform/api/spdy_containers.h" namespace spdy {
diff --git a/spdy/core/spdy_alt_svc_wire_format.h b/spdy/core/spdy_alt_svc_wire_format.h index d8d23df..fccda75 100644 --- a/spdy/core/spdy_alt_svc_wire_format.h +++ b/spdy/core/spdy_alt_svc_wire_format.h
@@ -14,9 +14,9 @@ #include <string> #include <vector> +#include "absl/container/inlined_vector.h" #include "absl/strings/string_view.h" #include "common/platform/api/quiche_export.h" -#include "spdy/platform/api/spdy_containers.h" namespace spdy { @@ -26,7 +26,7 @@ class QUICHE_EXPORT_PRIVATE SpdyAltSvcWireFormat { public: - using VersionVector = SpdyInlinedVector<uint32_t, 8>; + using VersionVector = absl::InlinedVector<uint32_t, 8>; struct QUICHE_EXPORT_PRIVATE AlternativeService { std::string protocol_id;
diff --git a/spdy/platform/api/spdy_containers.h b/spdy/platform/api/spdy_containers.h index 33da399..9e3813f 100644 --- a/spdy/platform/api/spdy_containers.h +++ b/spdy/platform/api/spdy_containers.h
@@ -13,10 +13,6 @@ template <typename Key, typename Value, typename Hash, typename Eq> using SpdyLinkedHashMap = SpdyLinkedHashMapImpl<Key, Value, Hash, Eq>; -// A vector optimized for small sizes. Provides the same APIs as a std::vector. -template <typename T, size_t N, typename A = std::allocator<T>> -using SpdyInlinedVector = SpdyInlinedVectorImpl<T, N, A>; - // Used for maps that are typically small, then it is faster than (for example) // hash_map which is optimized for large data sets. SpdySmallMap upgrades itself // automatically to a SpdySmallMapImpl-specified map when it runs out of space.