Use quiche_export instead of http2_export.
gfe-relnote: n/a, no functional change.
PiperOrigin-RevId: 290798015
Change-Id: I9029951e8c4d25746c4074dbf1903a05747e3e0f
diff --git a/http2/hpack/decoder/hpack_block_decoder.h b/http2/hpack/decoder/hpack_block_decoder.h
index fb44c3f..ed4b0b0 100644
--- a/http2/hpack/decoder/hpack_block_decoder.h
+++ b/http2/hpack/decoder/hpack_block_decoder.h
@@ -16,12 +16,12 @@
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_entry_decoder.h"
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_entry_decoder_listener.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 {
-class HTTP2_EXPORT_PRIVATE HpackBlockDecoder {
+class QUICHE_EXPORT_PRIVATE HpackBlockDecoder {
public:
explicit HpackBlockDecoder(HpackEntryDecoderListener* listener)
: listener_(listener) {
@@ -57,8 +57,8 @@
bool before_entry_ = true;
};
-HTTP2_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& out,
- const HpackBlockDecoder& v);
+QUICHE_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& out,
+ const HpackBlockDecoder& v);
} // namespace http2
diff --git a/http2/hpack/decoder/hpack_decoder.h b/http2/hpack/decoder/hpack_decoder.h
index 663fef6..0de876a 100644
--- a/http2/hpack/decoder/hpack_decoder.h
+++ b/http2/hpack/decoder/hpack_decoder.h
@@ -29,7 +29,7 @@
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_decoder_state.h"
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_decoder_tables.h"
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_whole_entry_buffer.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"
#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace http2 {
@@ -37,7 +37,7 @@
class HpackDecoderPeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE HpackDecoder {
+class QUICHE_EXPORT_PRIVATE HpackDecoder {
public:
HpackDecoder(HpackDecoderListener* listener, size_t max_string_size);
virtual ~HpackDecoder();
diff --git a/http2/hpack/decoder/hpack_decoder_listener.h b/http2/hpack/decoder/hpack_decoder_listener.h
index 84eaf4a..f1b76db 100644
--- a/http2/hpack/decoder/hpack_decoder_listener.h
+++ b/http2/hpack/decoder/hpack_decoder_listener.h
@@ -10,12 +10,12 @@
#include "net/third_party/quiche/src/http2/hpack/hpack_string.h"
#include "net/third_party/quiche/src/http2/hpack/http2_hpack_constants.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"
#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace http2 {
-class HTTP2_EXPORT_PRIVATE HpackDecoderListener {
+class QUICHE_EXPORT_PRIVATE HpackDecoderListener {
public:
HpackDecoderListener();
virtual ~HpackDecoderListener();
@@ -43,7 +43,7 @@
// A no-op implementation of HpackDecoderListener, useful for ignoring
// callbacks once an error is detected.
-class HTTP2_EXPORT_PRIVATE HpackDecoderNoOpListener
+class QUICHE_EXPORT_PRIVATE HpackDecoderNoOpListener
: public HpackDecoderListener {
public:
HpackDecoderNoOpListener();
diff --git a/http2/hpack/decoder/hpack_decoder_state.h b/http2/hpack/decoder/hpack_decoder_state.h
index 0139b31..4436ef3 100644
--- a/http2/hpack/decoder/hpack_decoder_state.h
+++ b/http2/hpack/decoder/hpack_decoder_state.h
@@ -21,7 +21,7 @@
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_decoder_tables.h"
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_whole_entry_listener.h"
#include "net/third_party/quiche/src/http2/hpack/http2_hpack_constants.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"
#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace http2 {
@@ -29,7 +29,7 @@
class HpackDecoderStatePeer;
} // namespace test
-class HTTP2_EXPORT_PRIVATE HpackDecoderState : public HpackWholeEntryListener {
+class QUICHE_EXPORT_PRIVATE HpackDecoderState : public HpackWholeEntryListener {
public:
explicit HpackDecoderState(HpackDecoderListener* listener);
~HpackDecoderState() override;
diff --git a/http2/hpack/decoder/hpack_decoder_string_buffer.h b/http2/hpack/decoder/hpack_decoder_string_buffer.h
index 94c46d5..1ae8e6b 100644
--- a/http2/hpack/decoder/hpack_decoder_string_buffer.h
+++ b/http2/hpack/decoder/hpack_decoder_string_buffer.h
@@ -15,12 +15,12 @@
#include <string>
#include "net/third_party/quiche/src/http2/hpack/huffman/hpack_huffman_decoder.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"
#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace http2 {
-class HTTP2_EXPORT_PRIVATE HpackDecoderStringBuffer {
+class QUICHE_EXPORT_PRIVATE HpackDecoderStringBuffer {
public:
enum class State : uint8_t { RESET, COLLECTING, COMPLETE };
enum class Backing : uint8_t { RESET, UNBUFFERED, BUFFERED, STATIC };
@@ -93,7 +93,7 @@
Backing backing_;
};
-HTTP2_EXPORT_PRIVATE std::ostream& operator<<(
+QUICHE_EXPORT_PRIVATE std::ostream& operator<<(
std::ostream& out,
const HpackDecoderStringBuffer& v);
diff --git a/http2/hpack/decoder/hpack_decoder_tables.h b/http2/hpack/decoder/hpack_decoder_tables.h
index 6df145c..28bab5b 100644
--- a/http2/hpack/decoder/hpack_decoder_tables.h
+++ b/http2/hpack/decoder/hpack_decoder_tables.h
@@ -24,7 +24,7 @@
#include "net/third_party/quiche/src/http2/hpack/hpack_string.h"
#include "net/third_party/quiche/src/http2/http2_constants.h"
#include "net/third_party/quiche/src/http2/platform/api/http2_containers.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 {
@@ -34,7 +34,7 @@
// HpackDecoderTablesDebugListener supports a QUIC experiment, enabling
// the gathering of information about the time-line of use of HPACK
// dynamic table entries.
-class HTTP2_EXPORT_PRIVATE HpackDecoderTablesDebugListener {
+class QUICHE_EXPORT_PRIVATE HpackDecoderTablesDebugListener {
public:
HpackDecoderTablesDebugListener();
virtual ~HpackDecoderTablesDebugListener();
@@ -65,7 +65,7 @@
// See http://httpwg.org/specs/rfc7541.html#static.table.definition for the
// contents, and http://httpwg.org/specs/rfc7541.html#index.address.space for
// info about accessing the static table.
-class HTTP2_EXPORT_PRIVATE HpackDecoderStaticTable {
+class QUICHE_EXPORT_PRIVATE HpackDecoderStaticTable {
public:
explicit HpackDecoderStaticTable(const std::vector<HpackStringPair>* table);
// Uses a global table shared by all threads.
@@ -85,7 +85,7 @@
// in the dynamic table. See these sections of the RFC:
// http://httpwg.org/specs/rfc7541.html#dynamic.table
// http://httpwg.org/specs/rfc7541.html#dynamic.table.management
-class HTTP2_EXPORT_PRIVATE HpackDecoderDynamicTable {
+class QUICHE_EXPORT_PRIVATE HpackDecoderDynamicTable {
public:
HpackDecoderDynamicTable();
~HpackDecoderDynamicTable();
@@ -144,7 +144,7 @@
HpackDecoderTablesDebugListener* debug_listener_;
};
-class HTTP2_EXPORT_PRIVATE HpackDecoderTables {
+class QUICHE_EXPORT_PRIVATE HpackDecoderTables {
public:
HpackDecoderTables();
~HpackDecoderTables();
diff --git a/http2/hpack/decoder/hpack_entry_decoder.h b/http2/hpack/decoder/hpack_entry_decoder.h
index 1848fb6..1da3644 100644
--- a/http2/hpack/decoder/hpack_entry_decoder.h
+++ b/http2/hpack/decoder/hpack_entry_decoder.h
@@ -18,12 +18,12 @@
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_entry_type_decoder.h"
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_string_decoder.h"
#include "net/third_party/quiche/src/http2/hpack/http2_hpack_constants.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 {
-class HTTP2_EXPORT_PRIVATE HpackEntryDecoder {
+class QUICHE_EXPORT_PRIVATE HpackEntryDecoder {
public:
enum class EntryDecoderState {
// Have started decoding the type/varint, but didn't finish on the previous
@@ -75,9 +75,9 @@
EntryDecoderState state_ = EntryDecoderState();
};
-HTTP2_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& out,
- const HpackEntryDecoder& v);
-HTTP2_EXPORT_PRIVATE std::ostream& operator<<(
+QUICHE_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& out,
+ const HpackEntryDecoder& v);
+QUICHE_EXPORT_PRIVATE std::ostream& operator<<(
std::ostream& out,
HpackEntryDecoder::EntryDecoderState state);
diff --git a/http2/hpack/decoder/hpack_entry_decoder_listener.h b/http2/hpack/decoder/hpack_entry_decoder_listener.h
index fd11f59..ff75eeb 100644
--- a/http2/hpack/decoder/hpack_entry_decoder_listener.h
+++ b/http2/hpack/decoder/hpack_entry_decoder_listener.h
@@ -12,11 +12,11 @@
#include <stddef.h>
#include "net/third_party/quiche/src/http2/hpack/http2_hpack_constants.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 HpackEntryDecoderListener {
+class QUICHE_EXPORT_PRIVATE HpackEntryDecoderListener {
public:
virtual ~HpackEntryDecoderListener() {}
@@ -64,7 +64,7 @@
virtual void OnDynamicTableSizeUpdate(size_t size) = 0;
};
-class HTTP2_EXPORT_PRIVATE HpackEntryDecoderVLoggingListener
+class QUICHE_EXPORT_PRIVATE HpackEntryDecoderVLoggingListener
: public HpackEntryDecoderListener {
public:
HpackEntryDecoderVLoggingListener() : wrapped_(nullptr) {}
@@ -88,7 +88,7 @@
};
// A no-op implementation of HpackEntryDecoderListener.
-class HTTP2_EXPORT_PRIVATE HpackEntryDecoderNoOpListener
+class QUICHE_EXPORT_PRIVATE HpackEntryDecoderNoOpListener
: public HpackEntryDecoderListener {
public:
~HpackEntryDecoderNoOpListener() override {}
diff --git a/http2/hpack/decoder/hpack_entry_type_decoder.h b/http2/hpack/decoder/hpack_entry_type_decoder.h
index bf13cf9..ff2e77e 100644
--- a/http2/hpack/decoder/hpack_entry_type_decoder.h
+++ b/http2/hpack/decoder/hpack_entry_type_decoder.h
@@ -17,12 +17,12 @@
#include "net/third_party/quiche/src/http2/decoder/decode_status.h"
#include "net/third_party/quiche/src/http2/hpack/http2_hpack_constants.h"
#include "net/third_party/quiche/src/http2/hpack/varint/hpack_varint_decoder.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 {
-class HTTP2_EXPORT_PRIVATE HpackEntryTypeDecoder {
+class QUICHE_EXPORT_PRIVATE HpackEntryTypeDecoder {
public:
// Only call when the decode buffer has data (i.e. HpackEntryDecoder must
// not call until there is data).
@@ -50,8 +50,8 @@
HpackEntryType entry_type_ = HpackEntryType::kIndexedHeader;
};
-HTTP2_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& out,
- const HpackEntryTypeDecoder& v);
+QUICHE_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& out,
+ const HpackEntryTypeDecoder& v);
} // namespace http2
#endif // QUICHE_HTTP2_HPACK_DECODER_HPACK_ENTRY_TYPE_DECODER_H_
diff --git a/http2/hpack/decoder/hpack_string_decoder.h b/http2/hpack/decoder/hpack_string_decoder.h
index 0cd1742..cd25da4 100644
--- a/http2/hpack/decoder/hpack_string_decoder.h
+++ b/http2/hpack/decoder/hpack_string_decoder.h
@@ -18,9 +18,9 @@
#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/hpack/varint/hpack_varint_decoder.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/http2/platform/api/http2_macros.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_export.h"
namespace http2 {
@@ -33,7 +33,7 @@
// Resume() when more input is available, repeating until kDecodeInProgress is
// not returned. If kDecodeDone or kDecodeError is returned, then Resume() must
// not be called until Start() has been called to start decoding a new string.
-class HTTP2_EXPORT_PRIVATE HpackStringDecoder {
+class QUICHE_EXPORT_PRIVATE HpackStringDecoder {
public:
enum StringDecoderState {
kStartDecodingLength,
@@ -202,8 +202,8 @@
bool huffman_encoded_ = false;
};
-HTTP2_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& out,
- const HpackStringDecoder& v);
+QUICHE_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& out,
+ const HpackStringDecoder& v);
} // namespace http2
#endif // QUICHE_HTTP2_HPACK_DECODER_HPACK_STRING_DECODER_H_
diff --git a/http2/hpack/decoder/hpack_string_decoder_listener.h b/http2/hpack/decoder/hpack_string_decoder_listener.h
index 35a0417..6172d91 100644
--- a/http2/hpack/decoder/hpack_string_decoder_listener.h
+++ b/http2/hpack/decoder/hpack_string_decoder_listener.h
@@ -12,7 +12,7 @@
#include <stddef.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 {
@@ -20,7 +20,7 @@
// HpackStringDecoder methods require a listener that implements the methods
// below, but it is NOT necessary to extend this class because the methods
// are templates.
-class HTTP2_EXPORT_PRIVATE HpackStringDecoderListener {
+class QUICHE_EXPORT_PRIVATE HpackStringDecoderListener {
public:
virtual ~HpackStringDecoderListener() {}
@@ -39,7 +39,7 @@
virtual void OnStringEnd() = 0;
};
-class HTTP2_EXPORT_PRIVATE HpackStringDecoderVLoggingListener
+class QUICHE_EXPORT_PRIVATE HpackStringDecoderVLoggingListener
: public HpackStringDecoderListener {
public:
HpackStringDecoderVLoggingListener() : wrapped_(nullptr) {}
diff --git a/http2/hpack/decoder/hpack_whole_entry_buffer.h b/http2/hpack/decoder/hpack_whole_entry_buffer.h
index 814c1b4..fd445c0 100644
--- a/http2/hpack/decoder/hpack_whole_entry_buffer.h
+++ b/http2/hpack/decoder/hpack_whole_entry_buffer.h
@@ -16,14 +16,14 @@
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_entry_decoder_listener.h"
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_whole_entry_listener.h"
#include "net/third_party/quiche/src/http2/hpack/http2_hpack_constants.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"
#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace http2 {
// TODO(jamessynge): Consider renaming HpackEntryDecoderListener to
// HpackEntryPartsListener or HpackEntryFragmentsListener.
-class HTTP2_EXPORT_PRIVATE HpackWholeEntryBuffer
+class QUICHE_EXPORT_PRIVATE HpackWholeEntryBuffer
: public HpackEntryDecoderListener {
public:
// max_string_size specifies the maximum size of an on-the-wire string (name
diff --git a/http2/hpack/decoder/hpack_whole_entry_listener.h b/http2/hpack/decoder/hpack_whole_entry_listener.h
index eabe34a..86e8e7f 100644
--- a/http2/hpack/decoder/hpack_whole_entry_listener.h
+++ b/http2/hpack/decoder/hpack_whole_entry_listener.h
@@ -13,12 +13,12 @@
#include "net/third_party/quiche/src/http2/hpack/decoder/hpack_decoder_string_buffer.h"
#include "net/third_party/quiche/src/http2/hpack/http2_hpack_constants.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"
#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace http2 {
-class HTTP2_EXPORT_PRIVATE HpackWholeEntryListener {
+class QUICHE_EXPORT_PRIVATE HpackWholeEntryListener {
public:
virtual ~HpackWholeEntryListener();
