Use QuicheSmallOrderedSet instead of QuicSmallOrderedSet.

I will delete the header file in a separate CL to make it easier to review.

PiperOrigin-RevId: 445240107

quiche/quic/core/quic_interval_set.h

diff --git a/quiche/quic/core/quic_interval_set.h b/quiche/quic/core/quic_interval_set.h
index 7e2b11b..7de0362 100644
--- a/quiche/quic/core/quic_interval_set.h
+++ b/quiche/quic/core/quic_interval_set.h
@@ -60,8 +60,8 @@
 #include <vector>
 
 #include "quiche/quic/core/quic_interval.h"
-#include "quiche/quic/platform/api/quic_containers.h"
 #include "quiche/quic/platform/api/quic_logging.h"
+#include "quiche/common/platform/api/quiche_containers.h"
 
 namespace quic {
 
@@ -85,7 +85,7 @@
     bool operator()(T&& point, const value_type& a) const;
   };
 
-  using Set = QuicSmallOrderedSet<value_type, IntervalLess>;
+  using Set = quiche::QuicheSmallOrderedSet<value_type, IntervalLess>;
 
  public:
   using const_iterator = typename Set::const_iterator;

quiche/quic/platform/api/quic_containers.h

diff --git a/quiche/quic/platform/api/quic_containers.h b/quiche/quic/platform/api/quic_containers.h
index 9420393..1de0ff9 100644
--- a/quiche/quic/platform/api/quic_containers.h
+++ b/quiche/quic/platform/api/quic_containers.h
@@ -5,18 +5,6 @@
 #ifndef QUICHE_QUIC_PLATFORM_API_QUIC_CONTAINERS_H_
 #define QUICHE_QUIC_PLATFORM_API_QUIC_CONTAINERS_H_
 
-#include "quiche/common/platform/api/quiche_containers.h"
-
-namespace quic {
-
-// An ordered container optimized for small sets.
-// An implementation with O(n) mutations might be chosen
-// in case it has better memory usage and/or faster access.
-//
-// DOES NOT GUARANTEE POINTER OR ITERATOR STABILITY!
-template <typename Key, typename Compare = std::less<Key>>
-using QuicSmallOrderedSet = ::quiche::QuicheSmallOrderedSet<Key, Compare>;
-
-}  // namespace quic
+// TODO(bnc): Remove this file.
 
 #endif  // QUICHE_QUIC_PLATFORM_API_QUIC_CONTAINERS_H_