Remove QuicString wrapper for std::string
gfe-relnote: n/a (no functional change)
PiperOrigin-RevId: 238124961
Change-Id: I36e66a4326b4118d70effd356aef9734d2893763
diff --git a/quic/platform/api/quic_file_utils.h b/quic/platform/api/quic_file_utils.h
index 15eef0f..7558786 100644
--- a/quic/platform/api/quic_file_utils.h
+++ b/quic/platform/api/quic_file_utils.h
@@ -5,10 +5,10 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_FILE_UTILS_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_FILE_UTILS_H_
+#include <string>
#include <vector>
#include "net/third_party/quiche/src/quic/platform/api/quic_export.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h"
namespace quic {
diff --git a/quic/platform/api/quic_flags.h b/quic/platform/api/quic_flags.h
index 50bf4db..302036f 100644
--- a/quic/platform/api/quic_flags.h
+++ b/quic/platform/api/quic_flags.h
@@ -5,9 +5,9 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_FLAGS_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_FLAGS_H_
+#include <string>
#include <vector>
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
#include "net/quic/platform/impl/quic_flags_impl.h"
// Define a command-line flag that can be automatically set via
diff --git a/quic/platform/api/quic_hostname_utils.h b/quic/platform/api/quic_hostname_utils.h
index 3b068ee..672847c 100644
--- a/quic/platform/api/quic_hostname_utils.h
+++ b/quic/platform/api/quic_hostname_utils.h
@@ -5,8 +5,9 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_HOSTNAME_UTILS_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_HOSTNAME_UTILS_H_
+#include <string>
+
#include "net/third_party/quiche/src/quic/platform/api/quic_export.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h"
#include "net/quic/platform/impl/quic_hostname_utils_impl.h"
diff --git a/quic/platform/api/quic_hostname_utils_test.cc b/quic/platform/api/quic_hostname_utils_test.cc
index 8389f7d..2c6573b 100644
--- a/quic/platform/api/quic_hostname_utils_test.cc
+++ b/quic/platform/api/quic_hostname_utils_test.cc
@@ -4,8 +4,9 @@
#include "net/third_party/quiche/src/quic/platform/api/quic_hostname_utils.h"
+#include <string>
+
#include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_test.h"
namespace quic {
diff --git a/quic/platform/api/quic_ip_address.cc b/quic/platform/api/quic_ip_address.cc
index 8710467..e7a0fd9 100644
--- a/quic/platform/api/quic_ip_address.cc
+++ b/quic/platform/api/quic_ip_address.cc
@@ -2,8 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <string>
+
#include "net/third_party/quiche/src/quic/platform/api/quic_ip_address.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
namespace quic {
diff --git a/quic/platform/api/quic_ip_address.h b/quic/platform/api/quic_ip_address.h
index 33bd8fc..72dabed 100644
--- a/quic/platform/api/quic_ip_address.h
+++ b/quic/platform/api/quic_ip_address.h
@@ -5,8 +5,9 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_IP_ADDRESS_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_IP_ADDRESS_H_
+#include <string>
+
#include "net/third_party/quiche/src/quic/platform/api/quic_export.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
#include "net/quic/platform/impl/quic_ip_address_impl.h"
namespace quic {
diff --git a/quic/platform/api/quic_socket_address.cc b/quic/platform/api/quic_socket_address.cc
index 982ebf9..dacd6ac 100644
--- a/quic/platform/api/quic_socket_address.cc
+++ b/quic/platform/api/quic_socket_address.cc
@@ -2,8 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <string>
+
#include "net/third_party/quiche/src/quic/platform/api/quic_socket_address.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
namespace quic {
diff --git a/quic/platform/api/quic_socket_address.h b/quic/platform/api/quic_socket_address.h
index 21f29e4..57689a7 100644
--- a/quic/platform/api/quic_socket_address.h
+++ b/quic/platform/api/quic_socket_address.h
@@ -5,9 +5,10 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_SOCKET_ADDRESS_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_SOCKET_ADDRESS_H_
+#include <string>
+
#include "net/third_party/quiche/src/quic/platform/api/quic_export.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_ip_address.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
#include "net/quic/platform/impl/quic_socket_address_impl.h"
namespace quic {
diff --git a/quic/platform/api/quic_stack_trace.h b/quic/platform/api/quic_stack_trace.h
index 64411f0..ff6c887 100644
--- a/quic/platform/api/quic_stack_trace.h
+++ b/quic/platform/api/quic_stack_trace.h
@@ -5,7 +5,8 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_STACK_TRACE_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_STACK_TRACE_H_
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
+#include <string>
+
#include "net/quic/platform/impl/quic_stack_trace_impl.h"
namespace quic {
diff --git a/quic/platform/api/quic_str_cat.h b/quic/platform/api/quic_str_cat.h
index d5486db..534e31e 100644
--- a/quic/platform/api/quic_str_cat.h
+++ b/quic/platform/api/quic_str_cat.h
@@ -5,9 +5,9 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_STR_CAT_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_STR_CAT_H_
+#include <string>
#include <utility>
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
#include "net/quic/platform/impl/quic_str_cat_impl.h"
namespace quic {
diff --git a/quic/platform/api/quic_str_cat_test.cc b/quic/platform/api/quic_str_cat_test.cc
index 2930adf..06941bb 100644
--- a/quic/platform/api/quic_str_cat_test.cc
+++ b/quic/platform/api/quic_str_cat_test.cc
@@ -4,7 +4,8 @@
#include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
+#include <string>
+
#include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_test.h"
diff --git a/quic/platform/api/quic_string.h b/quic/platform/api/quic_string.h
deleted file mode 100644
index e911fa7..0000000
--- a/quic/platform/api/quic_string.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 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_STRING_H_
-#define QUICHE_QUIC_PLATFORM_API_QUIC_STRING_H_
-
-#include "net/quic/platform/impl/quic_string_impl.h"
-
-namespace quic {
-
-using QuicString = QuicStringImpl;
-
-} // namespace quic
-
-#endif // QUICHE_QUIC_PLATFORM_API_QUIC_STRING_H_
diff --git a/quic/platform/api/quic_string_utils.h b/quic/platform/api/quic_string_utils.h
index 76a101c..a30833e 100644
--- a/quic/platform/api/quic_string_utils.h
+++ b/quic/platform/api/quic_string_utils.h
@@ -5,9 +5,9 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_STRING_UTILS_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_STRING_UTILS_H_
+#include <string>
#include <utility>
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h"
#include "net/quic/platform/impl/quic_string_utils_impl.h"
diff --git a/quic/platform/api/quic_text_utils.h b/quic/platform/api/quic_text_utils.h
index e6c80d3..8db44ce 100644
--- a/quic/platform/api/quic_text_utils.h
+++ b/quic/platform/api/quic_text_utils.h
@@ -5,7 +5,8 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_TEXT_UTILS_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_TEXT_UTILS_H_
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
+#include <string>
+
#include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h"
#include "net/quic/platform/impl/quic_text_utils_impl.h"
diff --git a/quic/platform/api/quic_text_utils_test.cc b/quic/platform/api/quic_text_utils_test.cc
index 49eb9dc..9b156d0 100644
--- a/quic/platform/api/quic_text_utils_test.cc
+++ b/quic/platform/api/quic_text_utils_test.cc
@@ -4,7 +4,8 @@
#include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
+#include <string>
+
#include "net/third_party/quiche/src/quic/platform/api/quic_test.h"
namespace quic {
diff --git a/quic/platform/api/quic_thread.h b/quic/platform/api/quic_thread.h
index 77ae2e0..7032dc4 100644
--- a/quic/platform/api/quic_thread.h
+++ b/quic/platform/api/quic_thread.h
@@ -5,7 +5,8 @@
#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_THREAD_H_
#define QUICHE_QUIC_PLATFORM_API_QUIC_THREAD_H_
-#include "net/third_party/quiche/src/quic/platform/api/quic_string.h"
+#include <string>
+
#include "net/quic/platform/impl/quic_thread_impl.h"
namespace quic {
