commit 7f7fb05199101852596be2cd64d64b0ce635b731
author QUICHE team <quiche-dev@google.com> Thu Jun 27 06:46:30 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jun 27 06:47:29 2024 -0700
tree 83b9926520f742e5629fd9051d3a9e2d14cfcc3e
parent 11e6e62a2cd510e10bae51a4c3f6622fe70c184b

Automated g4 rollback of changelist 646639268.

*** Reason for rollback ***

Caused chromium build error:
https://chromium-review.googlesource.com/c/chromium/src/+/5659999?tab=checks

*** Original change description ***

Defines some string constants as `inline constexpr absl::string_view`.

***

PiperOrigin-RevId: 647299450

quiche/http2/adapter/http2_protocol.cc

diff --git a/quiche/http2/adapter/http2_protocol.cc b/quiche/http2/adapter/http2_protocol.cc
index 49bf9b7..63b74f6 100644
--- a/quiche/http2/adapter/http2_protocol.cc
+++ b/quiche/http2/adapter/http2_protocol.cc
@@ -9,6 +9,12 @@
 namespace http2 {
 namespace adapter {
 
+ABSL_CONST_INIT const char kHttp2MethodPseudoHeader[] = ":method";
+ABSL_CONST_INIT const char kHttp2SchemePseudoHeader[] = ":scheme";
+ABSL_CONST_INIT const char kHttp2AuthorityPseudoHeader[] = ":authority";
+ABSL_CONST_INIT const char kHttp2PathPseudoHeader[] = ":path";
+ABSL_CONST_INIT const char kHttp2StatusPseudoHeader[] = ":status";
+
 ABSL_CONST_INIT const uint8_t kMetadataFrameType = 0x4d;
 ABSL_CONST_INIT const uint8_t kMetadataEndFlag = 0x04;
 ABSL_CONST_INIT const uint16_t kMetadataExtensionId = 0x4d44;

quiche/http2/adapter/http2_protocol.h

diff --git a/quiche/http2/adapter/http2_protocol.h b/quiche/http2/adapter/http2_protocol.h
index 4456c14..b8e1c9d 100644
--- a/quiche/http2/adapter/http2_protocol.h
+++ b/quiche/http2/adapter/http2_protocol.h
@@ -62,16 +62,11 @@
 
 // The pseudo-header fields as specified in RFC 7540 Section 8.1.2.3 (request)
 // and Section 8.1.2.4 (response).
-QUICHE_EXPORT inline constexpr absl::string_view kHttp2MethodPseudoHeader =
-    ":method";
-QUICHE_EXPORT inline constexpr absl::string_view kHttp2SchemePseudoHeader =
-    ":scheme";
-QUICHE_EXPORT inline constexpr absl::string_view kHttp2AuthorityPseudoHeader =
-    ":authority";
-QUICHE_EXPORT inline constexpr absl::string_view kHttp2PathPseudoHeader =
-    ":path";
-QUICHE_EXPORT inline constexpr absl::string_view kHttp2StatusPseudoHeader =
-    ":status";
+ABSL_CONST_INIT QUICHE_EXPORT extern const char kHttp2MethodPseudoHeader[];
+ABSL_CONST_INIT QUICHE_EXPORT extern const char kHttp2SchemePseudoHeader[];
+ABSL_CONST_INIT QUICHE_EXPORT extern const char kHttp2AuthorityPseudoHeader[];
+ABSL_CONST_INIT QUICHE_EXPORT extern const char kHttp2PathPseudoHeader[];
+ABSL_CONST_INIT QUICHE_EXPORT extern const char kHttp2StatusPseudoHeader[];
 
 ABSL_CONST_INIT QUICHE_EXPORT extern const uint8_t kMetadataFrameType;
 ABSL_CONST_INIT QUICHE_EXPORT extern const uint8_t kMetadataEndFlag;

quiche/http2/adapter/nghttp2_util.cc

diff --git a/quiche/http2/adapter/nghttp2_util.cc b/quiche/http2/adapter/nghttp2_util.cc
index 3b96d03..a59f69d 100644
--- a/quiche/http2/adapter/nghttp2_util.cc
+++ b/quiche/http2/adapter/nghttp2_util.cc
@@ -99,8 +99,8 @@
 
   // Add the :status pseudoheader first.
   nghttp2_nv status;
-  status.name = ToUint8Ptr(kHttp2StatusPseudoHeader.data());
-  status.namelen = kHttp2StatusPseudoHeader.size();
+  status.name = ToUint8Ptr(kHttp2StatusPseudoHeader);
+  status.namelen = strlen(kHttp2StatusPseudoHeader);
   status.value = ToUint8Ptr(response_code.data());
   status.valuelen = response_code.size();
   status.flags = NGHTTP2_FLAG_NONE;