Use quiche_export instead of http2_export.
gfe-relnote: n/a, no functional change.
PiperOrigin-RevId: 290798015
Change-Id: I9029951e8c4d25746c4074dbf1903a05747e3e0f
diff --git a/http2/decoder/decode_buffer.h b/http2/decoder/decode_buffer.h
index e6604f1..241c553 100644
--- a/http2/decoder/decode_buffer.h
+++ b/http2/decoder/decode_buffer.h
@@ -17,14 +17,14 @@
#include <algorithm>
#include <cstdint>
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_logging.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace http2 {
class DecodeBufferSubset;
-class HTTP2_EXPORT_PRIVATE DecodeBuffer {
+class QUICHE_EXPORT_PRIVATE DecodeBuffer {
public:
DecodeBuffer(const char* buffer, size_t len)
: buffer_(buffer), cursor_(buffer), beyond_(buffer + len) {
@@ -129,7 +129,7 @@
// DecodeBuffer, though they can be nested (i.e. a DecodeBufferSubset's
// base may itself be a DecodeBufferSubset). This avoids the AdvanceCursor
// being called erroneously.
-class HTTP2_EXPORT_PRIVATE DecodeBufferSubset : public DecodeBuffer {
+class QUICHE_EXPORT_PRIVATE DecodeBufferSubset : public DecodeBuffer {
public:
DecodeBufferSubset(DecodeBuffer* base, size_t subset_len)
: DecodeBuffer(base->cursor(), base->MinLengthRemaining(subset_len)),
diff --git a/http2/decoder/decode_http2_structures.h b/http2/decoder/decode_http2_structures.h
index 3f6a317..cd3eda6 100644
--- a/http2/decoder/decode_http2_structures.h
+++ b/http2/decoder/decode_http2_structures.h
@@ -9,7 +9,7 @@
#include "net/third_party/quiche/src/http2/decoder/decode_buffer.h"
#include "net/third_party/quiche/src/http2/http2_structures.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
@@ -17,17 +17,17 @@
// to end, advancing the cursor by STRUCTURE::EncodedSize(). The decode buffer
// must be large enough (i.e. b->Remaining() >= STRUCTURE::EncodedSize()).
-HTTP2_EXPORT_PRIVATE void DoDecode(Http2FrameHeader* out, DecodeBuffer* b);
-HTTP2_EXPORT_PRIVATE void DoDecode(Http2PriorityFields* out, DecodeBuffer* b);
-HTTP2_EXPORT_PRIVATE void DoDecode(Http2RstStreamFields* out, DecodeBuffer* b);
-HTTP2_EXPORT_PRIVATE void DoDecode(Http2SettingFields* out, DecodeBuffer* b);
-HTTP2_EXPORT_PRIVATE void DoDecode(Http2PushPromiseFields* out,
- DecodeBuffer* b);
-HTTP2_EXPORT_PRIVATE void DoDecode(Http2PingFields* out, DecodeBuffer* b);
-HTTP2_EXPORT_PRIVATE void DoDecode(Http2GoAwayFields* out, DecodeBuffer* b);
-HTTP2_EXPORT_PRIVATE void DoDecode(Http2WindowUpdateFields* out,
- DecodeBuffer* b);
-HTTP2_EXPORT_PRIVATE void DoDecode(Http2AltSvcFields* out, DecodeBuffer* b);
+QUICHE_EXPORT_PRIVATE void DoDecode(Http2FrameHeader* out, DecodeBuffer* b);
+QUICHE_EXPORT_PRIVATE void DoDecode(Http2PriorityFields* out, DecodeBuffer* b);
+QUICHE_EXPORT_PRIVATE void DoDecode(Http2RstStreamFields* out, DecodeBuffer* b);
+QUICHE_EXPORT_PRIVATE void DoDecode(Http2SettingFields* out, DecodeBuffer* b);
+QUICHE_EXPORT_PRIVATE void DoDecode(Http2PushPromiseFields* out,
+ DecodeBuffer* b);
+QUICHE_EXPORT_PRIVATE void DoDecode(Http2PingFields* out, DecodeBuffer* b);
+QUICHE_EXPORT_PRIVATE void DoDecode(Http2GoAwayFields* out, DecodeBuffer* b);
+QUICHE_EXPORT_PRIVATE void DoDecode(Http2WindowUpdateFields* out,
+ DecodeBuffer* b);
+QUICHE_EXPORT_PRIVATE void DoDecode(Http2AltSvcFields* out, DecodeBuffer* b);
} // namespace http2
diff --git a/http2/decoder/decode_status.h b/http2/decoder/decode_status.h
index fdecd22..dcfed04 100644
--- a/http2/decoder/decode_status.h
+++ b/http2/decoder/decode_status.h
@@ -10,7 +10,7 @@
#include <ostream>
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
@@ -25,8 +25,8 @@
// an HTTP/2 frame has padding declared to be larger than the payload).
kDecodeError,
};
-HTTP2_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& out,
- DecodeStatus v);
+QUICHE_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& out,
+ DecodeStatus v);
} // namespace http2
diff --git a/http2/decoder/frame_decoder_state.h b/http2/decoder/frame_decoder_state.h
index b44d29b..69cbc76 100644
--- a/http2/decoder/frame_decoder_state.h
+++ b/http2/decoder/frame_decoder_state.h
@@ -22,15 +22,15 @@
#include "net/third_party/quiche/src/http2/decoder/http2_structure_decoder.h"
#include "net/third_party/quiche/src/http2/http2_constants.h"
#include "net/third_party/quiche/src/http2/http2_structures.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_logging.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
namespace test {
class FrameDecoderStatePeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE FrameDecoderState {
+class QUICHE_EXPORT_PRIVATE FrameDecoderState {
public:
FrameDecoderState() {}
diff --git a/http2/decoder/http2_frame_decoder.h b/http2/decoder/http2_frame_decoder.h
index dea40b7..cee8ec9 100644
--- a/http2/decoder/http2_frame_decoder.h
+++ b/http2/decoder/http2_frame_decoder.h
@@ -38,15 +38,15 @@
#include "net/third_party/quiche/src/http2/decoder/payload_decoders/unknown_payload_decoder.h"
#include "net/third_party/quiche/src/http2/decoder/payload_decoders/window_update_payload_decoder.h"
#include "net/third_party/quiche/src/http2/http2_structures.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_logging.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
namespace test {
class Http2FrameDecoderPeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE Http2FrameDecoder {
+class QUICHE_EXPORT_PRIVATE Http2FrameDecoder {
public:
explicit Http2FrameDecoder(Http2FrameDecoderListener* listener);
Http2FrameDecoder() : Http2FrameDecoder(nullptr) {}
diff --git a/http2/decoder/http2_structure_decoder.h b/http2/decoder/http2_structure_decoder.h
index 8ef5f78..0429097 100644
--- a/http2/decoder/http2_structure_decoder.h
+++ b/http2/decoder/http2_structure_decoder.h
@@ -19,15 +19,15 @@
#include "net/third_party/quiche/src/http2/decoder/decode_http2_structures.h"
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/http2_structures.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_logging.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
namespace test {
class Http2StructureDecoderPeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE Http2StructureDecoder {
+class QUICHE_EXPORT_PRIVATE Http2StructureDecoder {
public:
// The caller needs to keep track of whether to call Start or Resume.
//
diff --git a/http2/decoder/payload_decoders/altsvc_payload_decoder.h b/http2/decoder/payload_decoders/altsvc_payload_decoder.h
index e3523f9..d6df679 100644
--- a/http2/decoder/payload_decoders/altsvc_payload_decoder.h
+++ b/http2/decoder/payload_decoders/altsvc_payload_decoder.h
@@ -11,14 +11,14 @@
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/decoder/frame_decoder_state.h"
#include "net/third_party/quiche/src/http2/http2_structures.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
namespace test {
class AltSvcPayloadDecoderPeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE AltSvcPayloadDecoder {
+class QUICHE_EXPORT_PRIVATE AltSvcPayloadDecoder {
public:
// States during decoding of a ALTSVC frame.
enum class PayloadState {
diff --git a/http2/decoder/payload_decoders/continuation_payload_decoder.h b/http2/decoder/payload_decoders/continuation_payload_decoder.h
index 63b16ae..49716a8 100644
--- a/http2/decoder/payload_decoders/continuation_payload_decoder.h
+++ b/http2/decoder/payload_decoders/continuation_payload_decoder.h
@@ -10,11 +10,11 @@
#include "net/third_party/quiche/src/http2/decoder/decode_buffer.h"
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/decoder/frame_decoder_state.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
-class HTTP2_EXPORT_PRIVATE ContinuationPayloadDecoder {
+class QUICHE_EXPORT_PRIVATE ContinuationPayloadDecoder {
public:
// Starts the decoding of a CONTINUATION frame's payload, and completes
// it if the entire payload is in the provided decode buffer.
diff --git a/http2/decoder/payload_decoders/data_payload_decoder.h b/http2/decoder/payload_decoders/data_payload_decoder.h
index 1e083a9..a45e0e3 100644
--- a/http2/decoder/payload_decoders/data_payload_decoder.h
+++ b/http2/decoder/payload_decoders/data_payload_decoder.h
@@ -10,14 +10,14 @@
#include "net/third_party/quiche/src/http2/decoder/decode_buffer.h"
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/decoder/frame_decoder_state.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
namespace test {
class DataPayloadDecoderPeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE DataPayloadDecoder {
+class QUICHE_EXPORT_PRIVATE DataPayloadDecoder {
public:
// States during decoding of a DATA frame.
enum class PayloadState {
diff --git a/http2/decoder/payload_decoders/goaway_payload_decoder.h b/http2/decoder/payload_decoders/goaway_payload_decoder.h
index 7a50873..bf21bb1 100644
--- a/http2/decoder/payload_decoders/goaway_payload_decoder.h
+++ b/http2/decoder/payload_decoders/goaway_payload_decoder.h
@@ -14,14 +14,14 @@
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/decoder/frame_decoder_state.h"
#include "net/third_party/quiche/src/http2/http2_structures.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
namespace test {
class GoAwayPayloadDecoderPeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE GoAwayPayloadDecoder {
+class QUICHE_EXPORT_PRIVATE GoAwayPayloadDecoder {
public:
// States during decoding of a GOAWAY frame.
enum class PayloadState {
diff --git a/http2/decoder/payload_decoders/headers_payload_decoder.h b/http2/decoder/payload_decoders/headers_payload_decoder.h
index d3cdfe5..80afa0c 100644
--- a/http2/decoder/payload_decoders/headers_payload_decoder.h
+++ b/http2/decoder/payload_decoders/headers_payload_decoder.h
@@ -11,14 +11,14 @@
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/decoder/frame_decoder_state.h"
#include "net/third_party/quiche/src/http2/http2_structures.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
namespace test {
class HeadersPayloadDecoderPeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE HeadersPayloadDecoder {
+class QUICHE_EXPORT_PRIVATE HeadersPayloadDecoder {
public:
// States during decoding of a HEADERS frame, unless the fast path kicks
// in, in which case the state machine will be bypassed.
diff --git a/http2/decoder/payload_decoders/ping_payload_decoder.h b/http2/decoder/payload_decoders/ping_payload_decoder.h
index 84704fb..a24f729 100644
--- a/http2/decoder/payload_decoders/ping_payload_decoder.h
+++ b/http2/decoder/payload_decoders/ping_payload_decoder.h
@@ -12,14 +12,14 @@
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/decoder/frame_decoder_state.h"
#include "net/third_party/quiche/src/http2/http2_structures.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
namespace test {
class PingPayloadDecoderPeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE PingPayloadDecoder {
+class QUICHE_EXPORT_PRIVATE PingPayloadDecoder {
public:
// Starts the decoding of a PING frame's payload, and completes it if the
// entire payload is in the provided decode buffer.
diff --git a/http2/decoder/payload_decoders/priority_payload_decoder.h b/http2/decoder/payload_decoders/priority_payload_decoder.h
index 921eefe..75ef651 100644
--- a/http2/decoder/payload_decoders/priority_payload_decoder.h
+++ b/http2/decoder/payload_decoders/priority_payload_decoder.h
@@ -11,14 +11,14 @@
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/decoder/frame_decoder_state.h"
#include "net/third_party/quiche/src/http2/http2_structures.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
namespace test {
class PriorityPayloadDecoderPeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE PriorityPayloadDecoder {
+class QUICHE_EXPORT_PRIVATE PriorityPayloadDecoder {
public:
// Starts the decoding of a PRIORITY frame's payload, and completes it if
// the entire payload is in the provided decode buffer.
diff --git a/http2/decoder/payload_decoders/push_promise_payload_decoder.h b/http2/decoder/payload_decoders/push_promise_payload_decoder.h
index 2db9cb3..6cd27d2 100644
--- a/http2/decoder/payload_decoders/push_promise_payload_decoder.h
+++ b/http2/decoder/payload_decoders/push_promise_payload_decoder.h
@@ -11,14 +11,14 @@
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/decoder/frame_decoder_state.h"
#include "net/third_party/quiche/src/http2/http2_structures.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
namespace test {
class PushPromisePayloadDecoderPeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE PushPromisePayloadDecoder {
+class QUICHE_EXPORT_PRIVATE PushPromisePayloadDecoder {
public:
// States during decoding of a PUSH_PROMISE frame.
enum class PayloadState {
diff --git a/http2/decoder/payload_decoders/rst_stream_payload_decoder.h b/http2/decoder/payload_decoders/rst_stream_payload_decoder.h
index 947fc06..6842ffb 100644
--- a/http2/decoder/payload_decoders/rst_stream_payload_decoder.h
+++ b/http2/decoder/payload_decoders/rst_stream_payload_decoder.h
@@ -11,14 +11,14 @@
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/decoder/frame_decoder_state.h"
#include "net/third_party/quiche/src/http2/http2_structures.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
namespace test {
class RstStreamPayloadDecoderPeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE RstStreamPayloadDecoder {
+class QUICHE_EXPORT_PRIVATE RstStreamPayloadDecoder {
public:
// Starts the decoding of a RST_STREAM frame's payload, and completes it if
// the entire payload is in the provided decode buffer.
diff --git a/http2/decoder/payload_decoders/settings_payload_decoder.h b/http2/decoder/payload_decoders/settings_payload_decoder.h
index 7e3c313..e215f7e 100644
--- a/http2/decoder/payload_decoders/settings_payload_decoder.h
+++ b/http2/decoder/payload_decoders/settings_payload_decoder.h
@@ -12,14 +12,14 @@
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/decoder/frame_decoder_state.h"
#include "net/third_party/quiche/src/http2/http2_structures.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
namespace test {
class SettingsPayloadDecoderPeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE SettingsPayloadDecoder {
+class QUICHE_EXPORT_PRIVATE SettingsPayloadDecoder {
public:
// Starts the decoding of a SETTINGS frame's payload, and completes it if
// the entire payload is in the provided decode buffer.
diff --git a/http2/decoder/payload_decoders/unknown_payload_decoder.h b/http2/decoder/payload_decoders/unknown_payload_decoder.h
index 7bf4103..a716b30 100644
--- a/http2/decoder/payload_decoders/unknown_payload_decoder.h
+++ b/http2/decoder/payload_decoders/unknown_payload_decoder.h
@@ -13,11 +13,11 @@
#include "net/third_party/quiche/src/http2/decoder/decode_buffer.h"
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/decoder/frame_decoder_state.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
-class HTTP2_EXPORT_PRIVATE UnknownPayloadDecoder {
+class QUICHE_EXPORT_PRIVATE UnknownPayloadDecoder {
public:
// Starts decoding a payload of unknown type; just passes it to the listener.
DecodeStatus StartDecodingPayload(FrameDecoderState* state, DecodeBuffer* db);
diff --git a/http2/decoder/payload_decoders/window_update_payload_decoder.h b/http2/decoder/payload_decoders/window_update_payload_decoder.h
index 158c165..18a1f0c 100644
--- a/http2/decoder/payload_decoders/window_update_payload_decoder.h
+++ b/http2/decoder/payload_decoders/window_update_payload_decoder.h
@@ -11,14 +11,14 @@
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/decoder/frame_decoder_state.h"
#include "net/third_party/quiche/src/http2/http2_structures.h"
-#include "net/third_party/quiche/src/http2/platform/api/http2_export.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
namespace test {
class WindowUpdatePayloadDecoderPeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE WindowUpdatePayloadDecoder {
+class QUICHE_EXPORT_PRIVATE WindowUpdatePayloadDecoder {
public:
// Starts decoding a WINDOW_UPDATE frame's payload, and completes it if
// the entire payload is in the provided decode buffer.
