commit fb59a6aa3f718241506fb644f4daa295f992d596
author Mirko Bonadei <mbonadei@webrtc.org> Fri Sep 20 09:33:02 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Sep 20 08:27:52 2019 +0000
tree a0605d8c83f8cabdf0c2a31573cafcfb1a661990
parent e0b31677b68f8319527693ee204cc7acb89129f1

Return `const char*` from ToString(RTCErrorType error).

Returning absl::string_view causes problems to the Chromium/WebRTC
component build because absl::operator<< needs to be exported.

This CL switches to `const char*` which should be enough to avoid
to generate temporaries.

Bug: webrtc:9419
Change-Id: If169a6f95c7efd21ac8ce108c7f2f80a76ff2313
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153842
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29250}

api/BUILD.gn

diff --git a/api/BUILD.gn b/api/BUILD.gn
index f6be2c2..8366025 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -227,7 +227,6 @@
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base/system:rtc_export",
-    "//third_party/abseil-cpp/absl/strings",
   ]
 }
 

api/rtc_error.cc

diff --git a/api/rtc_error.cc b/api/rtc_error.cc
index 51fd07f..c9ad7cb 100644
--- a/api/rtc_error.cc
+++ b/api/rtc_error.cc
@@ -10,12 +10,11 @@
 
 #include "api/rtc_error.h"
 
-#include "absl/strings/string_view.h"
 #include "rtc_base/arraysize.h"
 
 namespace {
 
-const absl::string_view kRTCErrorTypeNames[] = {
+const char* kRTCErrorTypeNames[] = {
     "NONE",
     "UNSUPPORTED_OPERATION",
     "UNSUPPORTED_PARAMETER",
@@ -53,7 +52,7 @@
   message_ = std::move(message);
 }
 
-absl::string_view ToString(RTCErrorType error) {
+const char* ToString(RTCErrorType error) {
   int index = static_cast<int>(error);
   return kRTCErrorTypeNames[index];
 }

api/rtc_error.h

diff --git a/api/rtc_error.h b/api/rtc_error.h
index fdc1999..ffdcc0a 100644
--- a/api/rtc_error.h
+++ b/api/rtc_error.h
@@ -17,7 +17,6 @@
 #include <string>
 #include <utility>  // For std::move.
 
-#include "absl/strings/string_view.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/system/rtc_export.h"
@@ -130,9 +129,9 @@
 // Outputs the error as a friendly string. Update this method when adding a new
 // error type.
 //
-// Only intended to be used for logging/diagnostics. The string_view points
+// Only intended to be used for logging/diagnostics. The returned char* points
 // to literal string that lives for the whole duration of the program.
-absl::string_view ToString(RTCErrorType error);
+const char* ToString(RTCErrorType error);
 
 #ifdef UNIT_TEST
 inline std::ostream& operator<<(  // no-presubmit-check TODO(webrtc:8982)