Replace uses of RTCLegacyStatsMemberType

... by webrtc::StatsReport::Value::Type directly.

Enums are 1:1 mapped.

BUG=787254

Switch RTCLegacyStats away from WebString

The CL also changes RTCLegacyStatsMemberIterator similarly.

BUG=787254
R=guidou@chormium.org

Change-Id: Iba87df118c032f71ae363f0c44e25de010308dc7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1940430
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719948}

third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc

@@ -302,27 +302,6 @@ class CreateSessionDescriptionRequest
   PeerConnectionTracker::Action action_;
 };
 
-RTCLegacyStatsMemberType RTCLegacyStatsMemberTypeFromStatsValueType(
-    webrtc::StatsReport::Value::Type type) {
-  switch (type) {
-    case StatsReport::Value::kInt:
-      return kRTCLegacyStatsMemberTypeInt;
-    case StatsReport::Value::kInt64:
-      return kRTCLegacyStatsMemberTypeInt64;
-    case StatsReport::Value::kFloat:
-      return kRTCLegacyStatsMemberTypeFloat;
-    case StatsReport::Value::kString:
-    case StatsReport::Value::kStaticString:
-      return kRTCLegacyStatsMemberTypeString;
-    case StatsReport::Value::kBool:
-      return kRTCLegacyStatsMemberTypeBool;
-    case StatsReport::Value::kId:
-      return kRTCLegacyStatsMemberTypeId;
-  }
-  NOTREACHED();
-  return kRTCLegacyStatsMemberTypeInt;
-}
-
 // Class mapping responses from calls to libjingle
 // GetStats into a blink::WebRTCStatsCallback.
 class StatsResponse : public webrtc::StatsObserver {
@@ -369,8 +348,8 @@ class StatsResponse : public webrtc::StatsObserver {
       String GetName() const override {
         return String::FromUTF8(it_->second->display_name());
       }
-      RTCLegacyStatsMemberType GetType() const override {
-        return RTCLegacyStatsMemberTypeFromStatsValueType(it_->second->type());
+      webrtc::StatsReport::Value::Type GetType() const override {
+        return it_->second->type();
       }
       int ValueInt() const override { return it_->second->int_val(); }
       int64_t ValueInt64() const override { return it_->second->int64_val(); }

third_party/blink/renderer/platform/peerconnection/rtc_legacy_stats.h

@@ -6,22 +6,12 @@
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_PEERCONNECTION_RTC_LEGACY_STATS_H_
 
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
+#include "third_party/webrtc/api/stats_types.h"
 
 namespace blink {
 
 class RTCLegacyStatsMemberIterator;
 
-// TODO(crbug.com/787254): Use webrtc::StatsReport::Value::Type
-// directly.
-enum RTCLegacyStatsMemberType {
-  kRTCLegacyStatsMemberTypeInt,
-  kRTCLegacyStatsMemberTypeInt64,
-  kRTCLegacyStatsMemberTypeFloat,
-  kRTCLegacyStatsMemberTypeString,
-  kRTCLegacyStatsMemberTypeBool,
-  kRTCLegacyStatsMemberTypeId,
-};
-
 // TODO(crbug.com/787254): Remove both RTCLegacyStats and
 // RTCLegacyStatsMemberIterator base interfaces when they stopped
 // being referenced by renderer/platform (namely rtc_stats_response_base.h).
@@ -45,14 +35,14 @@ class RTCLegacyStatsMemberIterator {
   virtual void Next() = 0;
 
   virtual String GetName() const = 0;
-  virtual RTCLegacyStatsMemberType GetType() const = 0;
+  virtual webrtc::StatsReport::Value::Type GetType() const = 0;
   // Value getters. No conversion is performed; the function must match the
   // member's |type|.
-  virtual int ValueInt() const = 0;           // kRTCLegacyStatsMemberTypeInt
-  virtual int64_t ValueInt64() const = 0;     // kRTCLegacyStatsMemberTypeInt64
-  virtual float ValueFloat() const = 0;       // kRTCLegacyStatsMemberTypeFloat
-  virtual String ValueString() const = 0;     // kRTCLegacyStatsMemberTypeString
-  virtual bool ValueBool() const = 0;         // kRTCLegacyStatsMemberTypeBool
+  virtual int ValueInt() const = 0;
+  virtual int64_t ValueInt64() const = 0;
+  virtual float ValueFloat() const = 0;
+  virtual String ValueString() const = 0;
+  virtual bool ValueBool() const = 0;
 
   // Converts the value to string (regardless of |type|).
   virtual String ValueToString() const = 0;