gfe-relnote: Replace spdy_test.h with quiche_test.h. No functional change. Not protected. PiperOrigin-RevId: 294688771 Change-Id: Ie05596b83f6c973b0a17e4ad98bfa0596a4de3fe
diff --git a/common/platform/api/quiche_test.h b/common/platform/api/quiche_test.h index 6b64984..b584752 100644 --- a/common/platform/api/quiche_test.h +++ b/common/platform/api/quiche_test.h
@@ -7,6 +7,8 @@ #include "net/quiche/common/platform/impl/quiche_test_impl.h" +using QuicheTest = quiche::test::QuicheTest; + template <class T> using QuicheTestWithParam = quiche::test::QuicheTestWithParamImpl<T>;
diff --git a/spdy/core/array_output_buffer_test.cc b/spdy/core/array_output_buffer_test.cc index aac657a..06fc94d 100644 --- a/spdy/core/array_output_buffer_test.cc +++ b/spdy/core/array_output_buffer_test.cc
@@ -4,7 +4,7 @@ #include "net/third_party/quiche/src/spdy/core/array_output_buffer.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" namespace spdy { namespace test {
diff --git a/spdy/core/fifo_write_scheduler_test.cc b/spdy/core/fifo_write_scheduler_test.cc index 1ad6d62..950b641 100644 --- a/spdy/core/fifo_write_scheduler_test.cc +++ b/spdy/core/fifo_write_scheduler_test.cc
@@ -4,7 +4,7 @@ #include "net/third_party/quiche/src/spdy/core/fifo_write_scheduler.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_test_helpers.h" namespace spdy {
diff --git a/spdy/core/hpack/hpack_decoder_adapter_test.cc b/spdy/core/hpack/hpack_decoder_adapter_test.cc index 31b2a39..2fe01fc 100644 --- a/spdy/core/hpack/hpack_decoder_adapter_test.cc +++ b/spdy/core/hpack/hpack_decoder_adapter_test.cc
@@ -18,13 +18,13 @@ #include "net/third_party/quiche/src/http2/hpack/tools/hpack_block_builder.h" #include "net/third_party/quiche/src/http2/test_tools/http2_random.h" #include "net/third_party/quiche/src/common/platform/api/quiche_arraysize.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_constants.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_encoder.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_output_stream.h" #include "net/third_party/quiche/src/spdy/core/spdy_test_utils.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" using ::http2::HpackEntryType; using ::http2::HpackString; @@ -111,7 +111,7 @@ enum StartChoice { START_WITH_HANDLER, START_WITHOUT_HANDLER, NO_START }; class HpackDecoderAdapterTest - : public SpdyTestWithParam<std::tuple<StartChoice, bool>> { + : public QuicheTestWithParam<std::tuple<StartChoice, bool>> { protected: HpackDecoderAdapterTest() : decoder_(), decoder_peer_(&decoder_) {}
diff --git a/spdy/core/hpack/hpack_encoder_test.cc b/spdy/core/hpack/hpack_encoder_test.cc index eb2d826..2ac0a5f 100644 --- a/spdy/core/hpack/hpack_encoder_test.cc +++ b/spdy/core/hpack/hpack_encoder_test.cc
@@ -8,9 +8,9 @@ #include <map> #include "net/third_party/quiche/src/http2/test_tools/http2_random.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_huffman_table.h" #include "net/third_party/quiche/src/spdy/core/spdy_simple_arena.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" namespace spdy { @@ -127,7 +127,7 @@ kRepresentations, }; -class HpackEncoderTestBase : public SpdyTest { +class HpackEncoderTestBase : public QuicheTest { protected: typedef test::HpackEncoderPeer::Representations Representations;
diff --git a/spdy/core/hpack/hpack_entry_test.cc b/spdy/core/hpack/hpack_entry_test.cc index 9b51b1a..f9c142f 100644 --- a/spdy/core/hpack/hpack_entry_test.cc +++ b/spdy/core/hpack/hpack_entry_test.cc
@@ -4,13 +4,13 @@ #include "net/third_party/quiche/src/spdy/core/hpack/hpack_entry.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" namespace spdy { namespace { -class HpackEntryTest : public SpdyTest { +class HpackEntryTest : public QuicheTest { protected: HpackEntryTest() : name_("header-name"),
diff --git a/spdy/core/hpack/hpack_header_table_test.cc b/spdy/core/hpack/hpack_header_table_test.cc index 2adf15e..cc5674f 100644 --- a/spdy/core/hpack/hpack_header_table_test.cc +++ b/spdy/core/hpack/hpack_header_table_test.cc
@@ -10,9 +10,9 @@ #include <string> #include <vector> +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_constants.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_entry.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" namespace spdy { @@ -68,7 +68,7 @@ namespace { -class HpackHeaderTableTest : public SpdyTest { +class HpackHeaderTableTest : public QuicheTest { protected: typedef std::vector<HpackEntry> HpackEntryVector;
diff --git a/spdy/core/hpack/hpack_huffman_table_test.cc b/spdy/core/hpack/hpack_huffman_table_test.cc index b861fac..f49c73d 100644 --- a/spdy/core/hpack/hpack_huffman_table_test.cc +++ b/spdy/core/hpack/hpack_huffman_table_test.cc
@@ -9,10 +9,10 @@ #include "net/third_party/quiche/src/http2/hpack/huffman/hpack_huffman_decoder.h" #include "net/third_party/quiche/src/common/platform/api/quiche_arraysize.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_constants.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_output_stream.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" namespace spdy { @@ -38,7 +38,7 @@ // Tests of the ability to encode some canonical Huffman code, // not just the one defined in the RFC 7541. -class GenericHuffmanTableTest : public SpdyTest { +class GenericHuffmanTableTest : public QuicheTest { protected: GenericHuffmanTableTest() : table_(), peer_(table_) {}
diff --git a/spdy/core/hpack/hpack_output_stream_test.cc b/spdy/core/hpack/hpack_output_stream_test.cc index 4942417..21e6947 100644 --- a/spdy/core/hpack/hpack_output_stream_test.cc +++ b/spdy/core/hpack/hpack_output_stream_test.cc
@@ -6,7 +6,7 @@ #include <cstddef> -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" namespace spdy {
diff --git a/spdy/core/hpack/hpack_round_trip_test.cc b/spdy/core/hpack/hpack_round_trip_test.cc index 0679bb1..c4bf037 100644 --- a/spdy/core/hpack/hpack_round_trip_test.cc +++ b/spdy/core/hpack/hpack_round_trip_test.cc
@@ -8,11 +8,11 @@ #include <vector> #include "net/third_party/quiche/src/http2/test_tools/http2_random.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_constants.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_decoder_adapter.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_encoder.h" #include "net/third_party/quiche/src/spdy/core/spdy_test_utils.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" namespace spdy { namespace test { @@ -22,7 +22,7 @@ // Supports testing with the input split at every byte boundary. enum InputSizeParam { ALL_INPUT, ONE_BYTE, ZERO_THEN_ONE_BYTE }; -class HpackRoundTripTest : public SpdyTestWithParam<InputSizeParam> { +class HpackRoundTripTest : public QuicheTestWithParam<InputSizeParam> { protected: HpackRoundTripTest() : encoder_(ObtainHpackHuffmanTable()), decoder_() {}
diff --git a/spdy/core/hpack/hpack_static_table_test.cc b/spdy/core/hpack/hpack_static_table_test.cc index 957744c..42c6254 100644 --- a/spdy/core/hpack/hpack_static_table_test.cc +++ b/spdy/core/hpack/hpack_static_table_test.cc
@@ -8,8 +8,8 @@ #include <vector> #include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_constants.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" namespace spdy { @@ -17,7 +17,7 @@ namespace { -class HpackStaticTableTest : public SpdyTest { +class HpackStaticTableTest : public QuicheTest { protected: HpackStaticTableTest() : table_() {}
diff --git a/spdy/core/http2_priority_write_scheduler_test.cc b/spdy/core/http2_priority_write_scheduler_test.cc index abc3342..72f2386 100644 --- a/spdy/core/http2_priority_write_scheduler_test.cc +++ b/spdy/core/http2_priority_write_scheduler_test.cc
@@ -6,7 +6,7 @@ #include <initializer_list> -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_test_helpers.h" using ::testing::AssertionFailure; @@ -39,7 +39,7 @@ Http2PriorityWriteScheduler<StreamIdType>* scheduler_; }; -class Http2PriorityWriteSchedulerTest : public SpdyTest { +class Http2PriorityWriteSchedulerTest : public QuicheTest { protected: typedef uint32_t SpdyStreamId;
diff --git a/spdy/core/lifo_write_scheduler_test.cc b/spdy/core/lifo_write_scheduler_test.cc index c9acc11..1d7ecbf 100644 --- a/spdy/core/lifo_write_scheduler_test.cc +++ b/spdy/core/lifo_write_scheduler_test.cc
@@ -4,9 +4,9 @@ #include "net/third_party/quiche/src/spdy/core/lifo_write_scheduler.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/spdy_protocol.h" #include "net/third_party/quiche/src/spdy/core/spdy_test_utils.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_test_helpers.h" namespace spdy {
diff --git a/spdy/core/mock_spdy_framer_visitor.h b/spdy/core/mock_spdy_framer_visitor.h index 3425187..89ed853 100644 --- a/spdy/core/mock_spdy_framer_visitor.h +++ b/spdy/core/mock_spdy_framer_visitor.h
@@ -10,9 +10,9 @@ #include <utility> #include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/http2_frame_decoder_adapter.h" #include "net/third_party/quiche/src/spdy/core/spdy_test_utils.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" namespace spdy {
diff --git a/spdy/core/priority_write_scheduler_test.cc b/spdy/core/priority_write_scheduler_test.cc index f7e258c..45b1eb8 100644 --- a/spdy/core/priority_write_scheduler_test.cc +++ b/spdy/core/priority_write_scheduler_test.cc
@@ -4,9 +4,9 @@ #include "net/third_party/quiche/src/spdy/core/priority_write_scheduler.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/spdy_protocol.h" #include "net/third_party/quiche/src/spdy/core/spdy_test_utils.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_test_helpers.h" namespace spdy { @@ -29,7 +29,7 @@ namespace { -class PriorityWriteSchedulerTest : public SpdyTest { +class PriorityWriteSchedulerTest : public QuicheTest { public: PriorityWriteSchedulerTest() : peer_(&scheduler_) {}
diff --git a/spdy/core/spdy_alt_svc_wire_format_test.cc b/spdy/core/spdy_alt_svc_wire_format_test.cc index 6dc4bab..d80de7d 100644 --- a/spdy/core/spdy_alt_svc_wire_format_test.cc +++ b/spdy/core/spdy_alt_svc_wire_format_test.cc
@@ -4,8 +4,8 @@ #include "net/third_party/quiche/src/spdy/core/spdy_alt_svc_wire_format.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" namespace spdy {
diff --git a/spdy/core/spdy_deframer_visitor_test.cc b/spdy/core/spdy_deframer_visitor_test.cc index 4d5f802..b90d0b0 100644 --- a/spdy/core/spdy_deframer_visitor_test.cc +++ b/spdy/core/spdy_deframer_visitor_test.cc
@@ -10,6 +10,7 @@ #include <limits> #include "net/third_party/quiche/src/http2/test_tools/http2_random.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_constants.h" #include "net/third_party/quiche/src/spdy/core/mock_spdy_framer_visitor.h" #include "net/third_party/quiche/src/spdy/core/spdy_frame_builder.h" @@ -19,13 +20,12 @@ #include "net/third_party/quiche/src/spdy/core/spdy_protocol_test_utils.h" #include "net/third_party/quiche/src/spdy/core/spdy_test_utils.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" namespace spdy { namespace test { namespace { -class SpdyDeframerVisitorTest : public SpdyTest { +class SpdyDeframerVisitorTest : public QuicheTest { protected: SpdyDeframerVisitorTest() : encoder_(SpdyFramer::ENABLE_COMPRESSION) { decoder_.set_process_single_input_frame(true);
diff --git a/spdy/core/spdy_frame_builder_test.cc b/spdy/core/spdy_frame_builder_test.cc index 0deca77..b109323 100644 --- a/spdy/core/spdy_frame_builder_test.cc +++ b/spdy/core/spdy_frame_builder_test.cc
@@ -7,10 +7,10 @@ #include <memory> #include "net/third_party/quiche/src/common/platform/api/quiche_export.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/array_output_buffer.h" #include "net/third_party/quiche/src/spdy/core/spdy_framer.h" #include "net/third_party/quiche/src/spdy/core/spdy_protocol.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" namespace spdy {
diff --git a/spdy/core/spdy_frame_reader_test.cc b/spdy/core/spdy_frame_reader_test.cc index a3cfe21..0bbe7f6 100644 --- a/spdy/core/spdy_frame_reader_test.cc +++ b/spdy/core/spdy_frame_reader_test.cc
@@ -7,8 +7,8 @@ #include <cstdint> #include "net/third_party/quiche/src/common/platform/api/quiche_arraysize.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_endianness_util.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" namespace spdy {
diff --git a/spdy/core/spdy_framer_test.cc b/spdy/core/spdy_framer_test.cc index 7db0bb3..3505e89 100644 --- a/spdy/core/spdy_framer_test.cc +++ b/spdy/core/spdy_framer_test.cc
@@ -14,6 +14,7 @@ #include <vector> #include "net/third_party/quiche/src/common/platform/api/quiche_arraysize.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/array_output_buffer.h" #include "net/third_party/quiche/src/spdy/core/hpack/hpack_constants.h" #include "net/third_party/quiche/src/spdy/core/mock_spdy_framer_visitor.h" @@ -25,7 +26,6 @@ #include "net/third_party/quiche/src/spdy/platform/api/spdy_flags.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" using ::http2::Http2DecoderAdapter; using ::testing::_; @@ -462,7 +462,7 @@ // the socket. const size_t kMaxReadSize = 32; size_t bytes_read = - (rand() % std::min(input_remaining, kMaxReadSize)) + 1; + (rand() % std::min(input_remaining, kMaxReadSize)) + 1; // NOLINT size_t bytes_processed = deframer_.ProcessInput(input_ptr, bytes_read); input_remaining -= bytes_processed; input_ptr += bytes_processed; @@ -579,7 +579,7 @@ enum Output { USE, NOT_USE }; -class SpdyFramerTest : public SpdyTestWithParam<Output> { +class SpdyFramerTest : public QuicheTestWithParam<Output> { public: SpdyFramerTest() : output_(output_buffer, kSize), @@ -2766,7 +2766,7 @@ EXPECT_FALSE(frame_it.HasNextFrame()); } -class SpdyControlFrameIteratorTest : public SpdyTest { +class SpdyControlFrameIteratorTest : public quiche::test::QuicheTest { public: SpdyControlFrameIteratorTest() : output_(output_buffer, kSize) {}
diff --git a/spdy/core/spdy_header_block_test.cc b/spdy/core/spdy_header_block_test.cc index 806e89e..b670c2a 100644 --- a/spdy/core/spdy_header_block_test.cc +++ b/spdy/core/spdy_header_block_test.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/spdy_test_utils.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" using ::testing::ElementsAre;
diff --git a/spdy/core/spdy_header_storage_test.cc b/spdy/core/spdy_header_storage_test.cc index 2abd762..71af6be 100644 --- a/spdy/core/spdy_header_storage_test.cc +++ b/spdy/core/spdy_header_storage_test.cc
@@ -1,6 +1,6 @@ #include "net/third_party/quiche/src/spdy/core/spdy_header_storage.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" namespace spdy { namespace test {
diff --git a/spdy/core/spdy_intrusive_list_test.cc b/spdy/core/spdy_intrusive_list_test.cc index 48b19a1..e158d44 100644 --- a/spdy/core/spdy_intrusive_list_test.cc +++ b/spdy/core/spdy_intrusive_list_test.cc
@@ -10,7 +10,7 @@ #include <string> #include <utility> -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" namespace spdy { namespace test { @@ -29,11 +29,11 @@ swap(a.n, b.n); } -class IntrusiveListTest : public SpdyTest { +class IntrusiveListTest : public QuicheTest { protected: void CheckLists() { CheckLists(l1, ll1); - if (SpdyTest::HasFailure()) + if (QuicheTest::HasFailure()) return; CheckLists(l2, ll2); }
diff --git a/spdy/core/spdy_pinnable_buffer_piece_test.cc b/spdy/core/spdy_pinnable_buffer_piece_test.cc index 7d84463..b30a7c0 100644 --- a/spdy/core/spdy_pinnable_buffer_piece_test.cc +++ b/spdy/core/spdy_pinnable_buffer_piece_test.cc
@@ -6,14 +6,14 @@ #include <string> +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/spdy_prefixed_buffer_reader.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" namespace spdy { namespace test { -class SpdyPinnableBufferPieceTest : public SpdyTest { +class SpdyPinnableBufferPieceTest : public QuicheTest { protected: SpdyPrefixedBufferReader Build(const std::string& prefix, const std::string& suffix) {
diff --git a/spdy/core/spdy_prefixed_buffer_reader_test.cc b/spdy/core/spdy_prefixed_buffer_reader_test.cc index d1d141c..d48fde1 100644 --- a/spdy/core/spdy_prefixed_buffer_reader_test.cc +++ b/spdy/core/spdy_prefixed_buffer_reader_test.cc
@@ -7,7 +7,7 @@ #include <string> #include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" namespace spdy { @@ -15,7 +15,7 @@ using testing::ElementsAreArray; -class SpdyPrefixedBufferReaderTest : public SpdyTest { +class SpdyPrefixedBufferReaderTest : public QuicheTest { protected: SpdyPrefixedBufferReader Build(const std::string& prefix, const std::string& suffix) {
diff --git a/spdy/core/spdy_protocol_test.cc b/spdy/core/spdy_protocol_test.cc index af6df35..c952bce 100644 --- a/spdy/core/spdy_protocol_test.cc +++ b/spdy/core/spdy_protocol_test.cc
@@ -8,9 +8,9 @@ #include <limits> #include <memory> +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/spdy_bitmasks.h" #include "net/third_party/quiche/src/spdy/core/spdy_test_utils.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_test_helpers.h" namespace spdy {
diff --git a/spdy/core/spdy_protocol_test_utils.h b/spdy/core/spdy_protocol_test_utils.h index 8012db1..30c5c21 100644 --- a/spdy/core/spdy_protocol_test_utils.h +++ b/spdy/core/spdy_protocol_test_utils.h
@@ -20,10 +20,10 @@ #include <typeinfo> #include "net/third_party/quiche/src/http2/platform/api/http2_test_helpers.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/core/spdy_protocol.h" #include "net/third_party/quiche/src/spdy/core/spdy_test_utils.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" namespace spdy { namespace test {
diff --git a/spdy/core/spdy_simple_arena_test.cc b/spdy/core/spdy_simple_arena_test.cc index d20bdff..7e66567 100644 --- a/spdy/core/spdy_simple_arena_test.cc +++ b/spdy/core/spdy_simple_arena_test.cc
@@ -8,7 +8,7 @@ #include <vector> #include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" namespace spdy { namespace {
diff --git a/spdy/core/spdy_test_utils.cc b/spdy/core/spdy_test_utils.cc index 860e2e5..1d8db97 100644 --- a/spdy/core/spdy_test_utils.cc +++ b/spdy/core/spdy_test_utils.cc
@@ -11,9 +11,9 @@ #include <utility> #include <vector> +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_endianness_util.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" namespace spdy { namespace test {
diff --git a/spdy/platform/api/spdy_string_utils_test.cc b/spdy/platform/api/spdy_string_utils_test.cc index 9ca387a..4848bf0 100644 --- a/spdy/platform/api/spdy_string_utils_test.cc +++ b/spdy/platform/api/spdy_string_utils_test.cc
@@ -7,7 +7,7 @@ #include <cstdint> #include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_test.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" namespace spdy { namespace test {
diff --git a/spdy/platform/api/spdy_test.h b/spdy/platform/api/spdy_test.h deleted file mode 100644 index 6fa1bdb..0000000 --- a/spdy/platform/api/spdy_test.h +++ /dev/null
@@ -1,15 +0,0 @@ -// Copyright (c) 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef QUICHE_SPDY_PLATFORM_API_SPDY_TEST_H_ -#define QUICHE_SPDY_PLATFORM_API_SPDY_TEST_H_ - -#include "net/spdy/platform/impl/spdy_test_impl.h" - -// Defines the base classes to be used in SPDY tests. -using SpdyTest = SpdyTestImpl; -template <class T> -using SpdyTestWithParam = SpdyTestWithParamImpl<T>; - -#endif // QUICHE_SPDY_PLATFORM_API_SPDY_TEST_H_