Remove RTPPayloadStrategy and simplify RTPPayloadRegistry

webrtc/modules/rtp_rtcp/source/rtp_utility.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_utility.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
index 7dd59736fd044d855d0ae11ed146bd327c948e7f..6e84e6ff945ad5f187e1252641bff5fb8b9924d4 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
@@ -48,17 +48,13 @@ enum {
  * Misc utility routines
  */
 
-#if defined(_WIN32)
-bool StringCompare(const char* str1, const char* str2,
-                   const uint32_t length) {
-  return _strnicmp(str1, str2, length) == 0;
+bool StringCompare(const char* str1, const char* str2, const uint32_t length) {
+  return STR_NCASE_CMP(str1, str2, length) == 0;
 }
-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-bool StringCompare(const char* str1, const char* str2,
-                   const uint32_t length) {
-  return strncasecmp(str1, str2, length) == 0;
+
+bool StringCompare(const char* str1, const char* str2) {
+  return STR_CASE_CMP(str1, str2) == 0;
 }
-#endif
 
 size_t Word32Align(size_t size) {
   uint32_t remainder = size % 4;