Remove rtc::ConstantLabels from webrtc_overrides.
Constant Labels was only used by //third_party/libjingle_xmpp.
In CL [1] I removed this error handling mechanism from libjingle_xmpp
so it is possible to remove this code and simplify
//third_party/webrtc_overrides.
[1] - https://chromium-review.googlesource.com/c/chromium/src/+/1397607
Bug: 896154
Change-Id: I3b4d8869d7813c789b7b12f8cad0fdc079796491
Reviewed-on: https://chromium-review.googlesource.com/c/1397982
Reviewed-by: Tommi <tommi@chromium.org>
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
Cr-Commit-Position: refs/heads/master@{#625143}diff --git a/third_party/webrtc_overrides/rtc_base/diagnostic_logging.h b/third_party/webrtc_overrides/rtc_base/diagnostic_logging.h
index 022bb6e3..e8d31254 100644
--- a/third_party/webrtc_overrides/rtc_base/diagnostic_logging.h
+++ b/third_party/webrtc_overrides/rtc_base/diagnostic_logging.h
@@ -13,33 +13,6 @@
namespace rtc {
-///////////////////////////////////////////////////////////////////////////////
-// ConstantLabel can be used to easily generate string names from constant
-// values. This can be useful for logging descriptive names of error messages.
-// Usage:
-// const ConstantLabel LIBRARY_ERRORS[] = {
-// KLABEL(SOME_ERROR),
-// KLABEL(SOME_OTHER_ERROR),
-// ...
-// LASTLABEL
-// }
-//
-// int err = LibraryFunc();
-// LOG(LS_ERROR) << "LibraryFunc returned: "
-// << ErrorName(err, LIBRARY_ERRORS);
-
-struct ConstantLabel {
- int value;
- const char* label;
-};
-#define KLABEL(x) \
- { x, #x }
-#define LASTLABEL \
- { 0, 0 }
-
-const char* FindLabel(int value, const ConstantLabel entries[]);
-std::string ErrorName(int err, const ConstantLabel* err_table);
-
//////////////////////////////////////////////////////////////////////
// Note that the non-standard LoggingSeverity aliases exist because they are
// still in broad use. The meanings of the levels are:
diff --git a/third_party/webrtc_overrides/rtc_base/logging.cc b/third_party/webrtc_overrides/rtc_base/logging.cc
index a4699aa11..d10fd25 100644
--- a/third_party/webrtc_overrides/rtc_base/logging.cc
+++ b/third_party/webrtc_overrides/rtc_base/logging.cc
@@ -58,32 +58,6 @@
#endif
/////////////////////////////////////////////////////////////////////////////
-// Constant Labels
-/////////////////////////////////////////////////////////////////////////////
-
-const char* FindLabel(int value, const ConstantLabel entries[]) {
- for (int i = 0; entries[i].label; ++i) {
- if (value == entries[i].value)
- return entries[i].label;
- }
- return 0;
-}
-
-std::string ErrorName(int err, const ConstantLabel* err_table) {
- if (err == 0)
- return "No error";
-
- if (err_table != 0) {
- if (const char* value = FindLabel(err, err_table))
- return value;
- }
-
- char buffer[16];
- base::snprintf(buffer, sizeof(buffer), "0x%08x", err);
- return buffer;
-}
-
-/////////////////////////////////////////////////////////////////////////////
// Log helper functions
/////////////////////////////////////////////////////////////////////////////
