Replace QuicheStringPiece with absl::string_view
PiperOrigin-RevId: 336340921
Change-Id: I9c08453bd06cfcd3dd1c15b13e6998d7b0acc388
diff --git a/quic/platform/api/quic_cert_utils.h b/quic/platform/api/quic_cert_utils.h
index a680dd6..b2a5bc2 100644
--- a/quic/platform/api/quic_cert_utils.h
+++ b/quic/platform/api/quic_cert_utils.h
@@ -5,17 +5,16 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_CERT_UTILS_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_CERT_UTILS_H_
+#include "absl/strings/string_view.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_export.h"
#include "net/quic/platform/impl/quic_cert_utils_impl.h"
-#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace quic {
class QUIC_EXPORT_PRIVATE QuicCertUtils {
public:
- static bool ExtractSubjectNameFromDERCert(
- quiche::QuicheStringPiece cert,
- quiche::QuicheStringPiece* subject_out) {
+ static bool ExtractSubjectNameFromDERCert(absl::string_view cert,
+ absl::string_view* subject_out) {
return QuicCertUtilsImpl::ExtractSubjectNameFromDERCert(cert, subject_out);
}
};
diff --git a/quic/platform/api/quic_file_utils.cc b/quic/platform/api/quic_file_utils.cc
index 40dea3e..a9901e1 100644
--- a/quic/platform/api/quic_file_utils.cc
+++ b/quic/platform/api/quic_file_utils.cc
@@ -4,8 +4,8 @@
#include "net/third_party/quiche/src/quic/platform/api/quic_file_utils.h"
+#include "absl/strings/string_view.h"
#include "net/quic/platform/impl/quic_file_utils_impl.h"
-#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace quic {
@@ -16,8 +16,7 @@
}
// Reads the contents of |filename| as a string into |contents|.
-void ReadFileContents(quiche::QuicheStringPiece filename,
- std::string* contents) {
+void ReadFileContents(absl::string_view filename, std::string* contents) {
ReadFileContentsImpl(filename, contents);
}
diff --git a/quic/platform/api/quic_file_utils.h b/quic/platform/api/quic_file_utils.h
index 8191e0a..6142feb 100644
--- a/quic/platform/api/quic_file_utils.h
+++ b/quic/platform/api/quic_file_utils.h
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
+#include "absl/strings/string_view.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_export.h"
-#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace quic {
@@ -18,7 +18,7 @@
const std::string& dirname);
// Reads the contents of |filename| as a string into |contents|.
-QUIC_EXPORT_PRIVATE void ReadFileContents(quiche::QuicheStringPiece filename,
+QUIC_EXPORT_PRIVATE void ReadFileContents(absl::string_view filename,
std::string* contents);
} // namespace quic
diff --git a/quic/platform/api/quic_hostname_utils.cc b/quic/platform/api/quic_hostname_utils.cc
index 5a0ccc0..d13339c 100644
--- a/quic/platform/api/quic_hostname_utils.cc
+++ b/quic/platform/api/quic_hostname_utils.cc
@@ -3,18 +3,17 @@
// found in the LICENSE file.
#include "net/third_party/quiche/src/quic/platform/api/quic_hostname_utils.h"
-#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
+#include "absl/strings/string_view.h"
namespace quic {
// static
-bool QuicHostnameUtils::IsValidSNI(quiche::QuicheStringPiece sni) {
+bool QuicHostnameUtils::IsValidSNI(absl::string_view sni) {
return QuicHostnameUtilsImpl::IsValidSNI(sni);
}
// static
-std::string QuicHostnameUtils::NormalizeHostname(
- quiche::QuicheStringPiece hostname) {
+std::string QuicHostnameUtils::NormalizeHostname(absl::string_view hostname) {
return QuicHostnameUtilsImpl::NormalizeHostname(hostname);
}
diff --git a/quic/platform/api/quic_hostname_utils.h b/quic/platform/api/quic_hostname_utils.h
index 6a04044..a3c902e 100644
--- a/quic/platform/api/quic_hostname_utils.h
+++ b/quic/platform/api/quic_hostname_utils.h
@@ -7,9 +7,9 @@
#include <string>
+#include "absl/strings/string_view.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_export.h"
#include "net/quic/platform/impl/quic_hostname_utils_impl.h"
-#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace quic {
@@ -21,12 +21,12 @@
// (1) disallow IP addresses;
// (2) check that the hostname contains valid characters only; and
// (3) contains at least one dot.
- static bool IsValidSNI(quiche::QuicheStringPiece sni);
+ static bool IsValidSNI(absl::string_view sni);
// Canonicalizes the specified hostname. This involves a wide variety of
// transformations, including lowercasing, removing trailing dots and IDNA
// conversion.
- static std::string NormalizeHostname(quiche::QuicheStringPiece hostname);
+ static std::string NormalizeHostname(absl::string_view hostname);
};
} // namespace quic
diff --git a/quic/platform/api/quic_mem_slice_span.h b/quic/platform/api/quic_mem_slice_span.h
index a1e0bd0..741ecb1 100644
--- a/quic/platform/api/quic_mem_slice_span.h
+++ b/quic/platform/api/quic_mem_slice_span.h
@@ -5,9 +5,9 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_MEM_SLICE_SPAN_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_MEM_SLICE_SPAN_H_
+#include "absl/strings/string_view.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_export.h"
#include "net/quic/platform/impl/quic_mem_slice_span_impl.h"
-#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace quic {
@@ -39,8 +39,8 @@
}
// Return data of the span at |index| by the form of a
- // quiche::QuicheStringPiece.
- quiche::QuicheStringPiece GetData(int index) { return impl_.GetData(index); }
+ // absl::string_view.
+ absl::string_view GetData(int index) { return impl_.GetData(index); }
// Return the total length of the data inside the span.
QuicByteCount total_length() { return impl_.total_length(); }
diff --git a/quic/platform/api/quic_string_utils_test.cc b/quic/platform/api/quic_string_utils_test.cc
index 4f65b7d..e23b6ff 100644
--- a/quic/platform/api/quic_string_utils_test.cc
+++ b/quic/platform/api/quic_string_utils_test.cc
@@ -6,9 +6,9 @@
#include <cstdint>
+#include "absl/strings/string_view.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_test.h"
#include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h"
-#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace quic {
namespace test {
@@ -21,14 +21,14 @@
// Single string-like argument.
const char kFoo[] = "foo";
const std::string string_foo(kFoo);
- const quiche::QuicheStringPiece stringpiece_foo(string_foo);
+ const absl::string_view stringpiece_foo(string_foo);
EXPECT_EQ("foo", quiche::QuicheStrCat(kFoo));
EXPECT_EQ("foo", quiche::QuicheStrCat(string_foo));
EXPECT_EQ("foo", quiche::QuicheStrCat(stringpiece_foo));
// Two string-like arguments.
const char kBar[] = "bar";
- const quiche::QuicheStringPiece stringpiece_bar(kBar);
+ const absl::string_view stringpiece_bar(kBar);
const std::string string_bar(kBar);
EXPECT_EQ("foobar", quiche::QuicheStrCat(kFoo, kBar));
EXPECT_EQ("foobar", quiche::QuicheStrCat(kFoo, string_bar));
@@ -81,7 +81,7 @@
// Single string-like argument.
const char kFoo[] = "foo";
const std::string string_foo(kFoo);
- const quiche::QuicheStringPiece stringpiece_foo(string_foo);
+ const absl::string_view stringpiece_foo(string_foo);
QuicStrAppend(&output, kFoo);
EXPECT_EQ("foo", output);
QuicStrAppend(&output, string_foo);
@@ -97,7 +97,7 @@
// Two string-like arguments.
const char kBar[] = "bar";
- const quiche::QuicheStringPiece stringpiece_bar(kBar);
+ const absl::string_view stringpiece_bar(kBar);
const std::string string_bar(kBar);
QuicStrAppend(&output, kFoo, kBar);
EXPECT_EQ("foobar", output);
diff --git a/quic/platform/api/quic_test_output.h b/quic/platform/api/quic_test_output.h
index 2499876..f925db6 100644
--- a/quic/platform/api/quic_test_output.h
+++ b/quic/platform/api/quic_test_output.h
@@ -5,22 +5,21 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_TEST_OUTPUT_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_TEST_OUTPUT_H_
+#include "absl/strings/string_view.h"
#include "net/quic/platform/impl/quic_test_output_impl.h"
-#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace quic {
// Save |data| into ${QUIC_TEST_OUTPUT_DIR}/filename. If a file with the same
// path already exists, overwrite it.
-inline void QuicSaveTestOutput(quiche::QuicheStringPiece filename,
- quiche::QuicheStringPiece data) {
+inline void QuicSaveTestOutput(absl::string_view filename,
+ absl::string_view data) {
QuicSaveTestOutputImpl(filename, data);
}
// Load the content of ${QUIC_TEST_OUTPUT_DIR}/filename into |*data|.
// Return whether it is successfully loaded.
-inline bool QuicLoadTestOutput(quiche::QuicheStringPiece filename,
- std::string* data) {
+inline bool QuicLoadTestOutput(absl::string_view filename, std::string* data) {
return QuicLoadTestOutputImpl(filename, data);
}
@@ -31,8 +30,8 @@
// The |identifier| is a human-readable identifier that will be combined with
// the name of the unit test and a timestamp. |data| is the serialized
// quic_trace.Trace protobuf that is being recorded into the file.
-inline void QuicRecordTrace(quiche::QuicheStringPiece identifier,
- quiche::QuicheStringPiece data) {
+inline void QuicRecordTrace(absl::string_view identifier,
+ absl::string_view data) {
QuicRecordTraceImpl(identifier, data);
}
diff --git a/quic/platform/api/quic_testvalue.h b/quic/platform/api/quic_testvalue.h
index 0df0c40..96ce968 100644
--- a/quic/platform/api/quic_testvalue.h
+++ b/quic/platform/api/quic_testvalue.h
@@ -5,8 +5,8 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_TESTVALUE_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_TESTVALUE_H_
+#include "absl/strings/string_view.h"
#include "net/quic/platform/impl/quic_testvalue_impl.h"
-#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
namespace quic {
@@ -16,7 +16,7 @@
//
// Note that this method does nothing in Chromium.
template <class T>
-void AdjustTestValue(quiche::QuicheStringPiece label, T* var) {
+void AdjustTestValue(absl::string_view label, T* var) {
AdjustTestValueImpl(label, var);
}
