Remove QuicFuzzedDataProvider.
When QPACK fuzzers were added, FuzzedDataProvider was a Chromium-only class in
//base, so I forked that internally as QuicFuzzedDataProviderImpl. It has since
been upstreamed into LLVM (see QuicFuzzedDataProvider), and is available both in
Chrome and internally in the <fuzzer/FuzzedDataProvider.h> header file.
PiperOrigin-RevId: 404400618
diff --git a/quic/core/qpack/fuzzer/qpack_decoder_fuzzer.cc b/quic/core/qpack/fuzzer/qpack_decoder_fuzzer.cc
index 466966a..b3d15f3 100644
--- a/quic/core/qpack/fuzzer/qpack_decoder_fuzzer.cc
+++ b/quic/core/qpack/fuzzer/qpack_decoder_fuzzer.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <fuzzer/FuzzedDataProvider.h>
+
#include <cstddef>
#include <cstdint>
#include <limits>
@@ -10,7 +12,6 @@
#include "absl/strings/string_view.h"
#include "quic/core/qpack/qpack_decoder.h"
#include "quic/core/quic_error_codes.h"
-#include "quic/platform/api/quic_fuzzed_data_provider.h"
#include "quic/test_tools/qpack/qpack_decoder_test_utils.h"
#include "quic/test_tools/qpack/qpack_test_utils.h"
@@ -79,7 +80,7 @@
// different ways, so the output could not be expected to match the original
// input.
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
- QuicFuzzedDataProvider provider(data, size);
+ FuzzedDataProvider provider(data, size);
// Maximum 256 byte dynamic table. Such a small size helps test draining
// entries and eviction.
diff --git a/quic/core/qpack/fuzzer/qpack_encoder_stream_receiver_fuzzer.cc b/quic/core/qpack/fuzzer/qpack_encoder_stream_receiver_fuzzer.cc
index 78a1f70..5167536 100644
--- a/quic/core/qpack/fuzzer/qpack_encoder_stream_receiver_fuzzer.cc
+++ b/quic/core/qpack/fuzzer/qpack_encoder_stream_receiver_fuzzer.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "quic/core/qpack/qpack_encoder_stream_receiver.h"
+#include <fuzzer/FuzzedDataProvider.h>
#include <cstddef>
#include <cstdint>
#include "absl/strings/string_view.h"
-#include "quic/platform/api/quic_fuzzed_data_provider.h"
+#include "quic/core/qpack/qpack_encoder_stream_receiver.h"
#include "quic/platform/api/quic_logging.h"
namespace quic {
@@ -51,7 +51,7 @@
NoOpDelegate delegate;
QpackEncoderStreamReceiver receiver(&delegate);
- QuicFuzzedDataProvider provider(data, size);
+ FuzzedDataProvider provider(data, size);
while (!delegate.error_detected() && provider.remaining_bytes() != 0) {
// Process up to 64 kB fragments at a time. Too small upper bound might not
diff --git a/quic/core/qpack/fuzzer/qpack_encoder_stream_sender_fuzzer.cc b/quic/core/qpack/fuzzer/qpack_encoder_stream_sender_fuzzer.cc
index d303da0..1281ebf 100644
--- a/quic/core/qpack/fuzzer/qpack_encoder_stream_sender_fuzzer.cc
+++ b/quic/core/qpack/fuzzer/qpack_encoder_stream_sender_fuzzer.cc
@@ -2,13 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <fuzzer/FuzzedDataProvider.h>
+
#include <cstddef>
#include <cstdint>
#include <limits>
#include <string>
#include "quic/core/qpack/qpack_encoder_stream_sender.h"
-#include "quic/platform/api/quic_fuzzed_data_provider.h"
#include "quic/test_tools/qpack/qpack_encoder_test_utils.h"
#include "quic/test_tools/qpack/qpack_test_utils.h"
@@ -24,7 +25,7 @@
QpackEncoderStreamSender sender;
sender.set_qpack_stream_sender_delegate(&delegate);
- QuicFuzzedDataProvider provider(data, size);
+ FuzzedDataProvider provider(data, size);
// Limit string literal length to 2 kB for efficiency.
const uint16_t kMaxStringLength = 2048;
diff --git a/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc b/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc
index c327bdc..43bf3d3 100644
--- a/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc
+++ b/quic/core/qpack/fuzzer/qpack_round_trip_fuzzer.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <fuzzer/FuzzedDataProvider.h>
+
#include <algorithm>
#include <cstddef>
#include <cstdint>
@@ -16,7 +18,6 @@
#include "quic/core/qpack/qpack_stream_sender_delegate.h"
#include "quic/core/qpack/value_splitting_header_list.h"
#include "quic/core/quic_error_codes.h"
-#include "quic/platform/api/quic_fuzzed_data_provider.h"
#include "quic/test_tools/qpack/qpack_decoder_test_utils.h"
#include "quic/test_tools/qpack/qpack_encoder_peer.h"
#include "common/quiche_circular_deque.h"
@@ -113,8 +114,7 @@
virtual void OnHeaderBlockEnd(QuicStreamId stream_id) = 0;
};
- DelayedHeaderBlockTransmitter(Visitor* visitor,
- QuicFuzzedDataProvider* provider)
+ DelayedHeaderBlockTransmitter(Visitor* visitor, FuzzedDataProvider* provider)
: visitor_(visitor), provider_(provider) {}
~DelayedHeaderBlockTransmitter() { QUICHE_CHECK(header_blocks_.empty()); }
@@ -241,7 +241,7 @@
};
Visitor* const visitor_;
- QuicFuzzedDataProvider* const provider_;
+ FuzzedDataProvider* const provider_;
std::map<QuicStreamId, std::queue<HeaderBlock>> header_blocks_;
};
@@ -422,7 +422,7 @@
class DelayedStreamDataTransmitter : public QpackStreamSenderDelegate {
public:
DelayedStreamDataTransmitter(QpackStreamReceiver* receiver,
- QuicFuzzedDataProvider* provider)
+ FuzzedDataProvider* provider)
: receiver_(receiver), provider_(provider) {}
~DelayedStreamDataTransmitter() { QUICHE_CHECK(stream_data.empty()); }
@@ -452,12 +452,12 @@
private:
QpackStreamReceiver* const receiver_;
- QuicFuzzedDataProvider* const provider_;
+ FuzzedDataProvider* const provider_;
quiche::QuicheCircularDeque<std::string> stream_data;
};
// Generate header list using fuzzer data.
-spdy::Http2HeaderBlock GenerateHeaderList(QuicFuzzedDataProvider* provider) {
+spdy::Http2HeaderBlock GenerateHeaderList(FuzzedDataProvider* provider) {
spdy::Http2HeaderBlock header_list;
uint8_t header_count = provider->ConsumeIntegral<uint8_t>();
for (uint8_t header_index = 0; header_index < header_count; ++header_index) {
@@ -581,7 +581,7 @@
// encoding then decoding is expected to result in the original header list, and
// this fuzzer checks for that.
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
- QuicFuzzedDataProvider provider(data, size);
+ FuzzedDataProvider provider(data, size);
// Maximum 256 byte dynamic table. Such a small size helps test draining
// entries and eviction.
diff --git a/quic/platform/api/quic_fuzzed_data_provider.h b/quic/platform/api/quic_fuzzed_data_provider.h
deleted file mode 100644
index ef565e2..0000000
--- a/quic/platform/api/quic_fuzzed_data_provider.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 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_QUIC_PLATFORM_API_QUIC_FUZZED_DATA_PROVIDER_H_
-#define QUICHE_QUIC_PLATFORM_API_QUIC_FUZZED_DATA_PROVIDER_H_
-
-#include "net/quic/platform/impl/quic_fuzzed_data_provider_impl.h"
-
-namespace quic {
-
-using QuicFuzzedDataProvider = QuicFuzzedDataProviderImpl;
-
-} // namespace quic
-
-#endif // QUICHE_QUIC_PLATFORM_API_QUIC_FUZZED_DATA_PROVIDER_H_
