Replace uses of blink::WebRTCStatsMemberType

... by webrtc::::RTCStatsMemberInterface::Type

This is a follow up of haraken@'s remark on [1].

[1] https://crrev.com/c/1772550/3/third_party/blink/renderer/platform/peerconnection/rtc_stats.cc@223

BUG=787254, 919392
R=haraken@chromium.org

Change-Id: I32e74b03813ee324263070603c4582e564381ffe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1772215
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Auto-Submit: Antonio Gomes <tonikitoo@igalia.com>
Cr-Commit-Position: refs/heads/master@{#691587}

content/renderer/media/webrtc/rtc_peer_connection_handler_unittest.cc

@@ -994,7 +994,7 @@ TEST_F(RTCPeerConnectionHandlerTest, GetRTCStats) {
     } else if (stats->Id().Utf8() == "RTCDefinedStats") {
       ++defined_stats_count;
       EXPECT_EQ(stats->Timestamp(), 2.0);
-      std::set<blink::WebRTCStatsMemberType> members;
+      std::set<webrtc::RTCStatsMemberInterface::Type> members;
       for (size_t i = 0; i < stats->MembersCount(); ++i) {
         std::unique_ptr<blink::WebRTCStatsMember> member = stats->GetMember(i);
         // TODO(hbos): A WebRTC-change is adding new members, this would cause
@@ -1006,50 +1006,50 @@ TEST_F(RTCPeerConnectionHandlerTest, GetRTCStats) {
         EXPECT_TRUE(member->IsDefined());
         members.insert(member->GetType());
         switch (member->GetType()) {
-          case blink::kWebRTCStatsMemberTypeBool:
+          case webrtc::RTCStatsMemberInterface::kBool:
             EXPECT_EQ(member->ValueBool(), true);
             break;
-          case blink::kWebRTCStatsMemberTypeInt32:
+          case webrtc::RTCStatsMemberInterface::kInt32:
             EXPECT_EQ(member->ValueInt32(), static_cast<int32_t>(42));
             break;
-          case blink::kWebRTCStatsMemberTypeUint32:
+          case webrtc::RTCStatsMemberInterface::kUint32:
             EXPECT_EQ(member->ValueUint32(), static_cast<uint32_t>(42));
             break;
-          case blink::kWebRTCStatsMemberTypeInt64:
+          case webrtc::RTCStatsMemberInterface::kInt64:
             EXPECT_EQ(member->ValueInt64(), static_cast<int64_t>(42));
             break;
-          case blink::kWebRTCStatsMemberTypeUint64:
+          case webrtc::RTCStatsMemberInterface::kUint64:
             EXPECT_EQ(member->ValueUint64(), static_cast<uint64_t>(42));
             break;
-          case blink::kWebRTCStatsMemberTypeDouble:
+          case webrtc::RTCStatsMemberInterface::kDouble:
             EXPECT_EQ(member->ValueDouble(), 42.0);
             break;
-          case blink::kWebRTCStatsMemberTypeString:
+          case webrtc::RTCStatsMemberInterface::kString:
             EXPECT_EQ(member->ValueString(), blink::WebString::FromUTF8("42"));
             break;
-          case blink::kWebRTCStatsMemberTypeSequenceBool:
+          case webrtc::RTCStatsMemberInterface::kSequenceBool:
             ExpectSequenceEquals(member->ValueSequenceBool(), 1);
             break;
-          case blink::kWebRTCStatsMemberTypeSequenceInt32:
+          case webrtc::RTCStatsMemberInterface::kSequenceInt32:
             ExpectSequenceEquals(member->ValueSequenceInt32(),
                                  static_cast<int32_t>(42));
             break;
-          case blink::kWebRTCStatsMemberTypeSequenceUint32:
+          case webrtc::RTCStatsMemberInterface::kSequenceUint32:
             ExpectSequenceEquals(member->ValueSequenceUint32(),
                                  static_cast<uint32_t>(42));
             break;
-          case blink::kWebRTCStatsMemberTypeSequenceInt64:
+          case webrtc::RTCStatsMemberInterface::kSequenceInt64:
             ExpectSequenceEquals(member->ValueSequenceInt64(),
                                  static_cast<int64_t>(42));
             break;
-          case blink::kWebRTCStatsMemberTypeSequenceUint64:
+          case webrtc::RTCStatsMemberInterface::kSequenceUint64:
             ExpectSequenceEquals(member->ValueSequenceUint64(),
                                  static_cast<uint64_t>(42));
             break;
-          case blink::kWebRTCStatsMemberTypeSequenceDouble:
+          case webrtc::RTCStatsMemberInterface::kSequenceDouble:
             ExpectSequenceEquals(member->ValueSequenceDouble(), 42.0);
             break;
-          case blink::kWebRTCStatsMemberTypeSequenceString:
+          case webrtc::RTCStatsMemberInterface::kSequenceString:
             ExpectSequenceEquals(member->ValueSequenceString(),
                                  blink::WebString::FromUTF8("42"));
             break;

third_party/blink/public/platform/web_rtc_stats.h

@@ -11,6 +11,7 @@
 #include "third_party/blink/public/platform/web_string.h"
 #include "third_party/blink/public/platform/web_vector.h"
 #include "third_party/webrtc/api/scoped_refptr.h"
+#include "third_party/webrtc/api/stats/rtc_stats.h"
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -29,24 +30,6 @@ namespace blink {
 class WebRTCStats;
 class WebRTCStatsMember;
 
-enum WebRTCStatsMemberType {
-  kWebRTCStatsMemberTypeBool,    // bool
-  kWebRTCStatsMemberTypeInt32,   // int32_t
-  kWebRTCStatsMemberTypeUint32,  // uint32_t
-  kWebRTCStatsMemberTypeInt64,   // int64_t
-  kWebRTCStatsMemberTypeUint64,  // uint64_t
-  kWebRTCStatsMemberTypeDouble,  // double
-  kWebRTCStatsMemberTypeString,  // WebString
-
-  kWebRTCStatsMemberTypeSequenceBool,    // WebVector<int>
-  kWebRTCStatsMemberTypeSequenceInt32,   // WebVector<int32_t>
-  kWebRTCStatsMemberTypeSequenceUint32,  // WebVector<uint32_t>
-  kWebRTCStatsMemberTypeSequenceInt64,   // WebVector<int64_t>
-  kWebRTCStatsMemberTypeSequenceUint64,  // WebVector<uint64_t>
-  kWebRTCStatsMemberTypeSequenceDouble,  // WebVector<double>
-  kWebRTCStatsMemberTypeSequenceString,  // WebVector<WebString>
-};
-
 class BLINK_PLATFORM_EXPORT WebRTCStatsReport {
  public:
   virtual ~WebRTCStatsReport();
@@ -91,7 +74,7 @@ class BLINK_PLATFORM_EXPORT WebRTCStatsMember {
   virtual ~WebRTCStatsMember();
 
   virtual WebString GetName() const = 0;
-  virtual WebRTCStatsMemberType GetType() const = 0;
+  virtual webrtc::RTCStatsMemberInterface::Type GetType() const = 0;
   virtual bool IsDefined() const = 0;
 
   // Value getters. No conversion is performed; the function must match the

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

@@ -36,50 +36,50 @@ v8::Local<v8::Value> WebRTCStatsToValue(ScriptState* script_state,
       continue;
     WebString name = member->GetName();
     switch (member->GetType()) {
-      case kWebRTCStatsMemberTypeBool:
+      case webrtc::RTCStatsMemberInterface::kBool:
         builder.AddBoolean(name, member->ValueBool());
         break;
-      case kWebRTCStatsMemberTypeInt32:
+      case webrtc::RTCStatsMemberInterface::kInt32:
         builder.AddNumber(name, static_cast<double>(member->ValueInt32()));
         break;
-      case kWebRTCStatsMemberTypeUint32:
+      case webrtc::RTCStatsMemberInterface::kUint32:
         builder.AddNumber(name, static_cast<double>(member->ValueUint32()));
         break;
-      case kWebRTCStatsMemberTypeInt64:
+      case webrtc::RTCStatsMemberInterface::kInt64:
         builder.AddNumber(name, static_cast<double>(member->ValueInt64()));
         break;
-      case kWebRTCStatsMemberTypeUint64:
+      case webrtc::RTCStatsMemberInterface::kUint64:
         builder.AddNumber(name, static_cast<double>(member->ValueUint64()));
         break;
-      case kWebRTCStatsMemberTypeDouble:
+      case webrtc::RTCStatsMemberInterface::kDouble:
         builder.AddNumber(name, member->ValueDouble());
         break;
-      case kWebRTCStatsMemberTypeString:
+      case webrtc::RTCStatsMemberInterface::kString:
         builder.AddString(name, member->ValueString());
         break;
-      case kWebRTCStatsMemberTypeSequenceBool: {
+      case webrtc::RTCStatsMemberInterface::kSequenceBool: {
         WebVector<int> sequence = member->ValueSequenceBool();
         Vector<bool> vector(SafeCast<wtf_size_t>(sequence.size()));
         std::copy(sequence.begin(), sequence.end(), vector.begin());
         builder.Add(name, vector);
         break;
       }
-      case kWebRTCStatsMemberTypeSequenceInt32:
+      case webrtc::RTCStatsMemberInterface::kSequenceInt32:
         add_vector(name, member->ValueSequenceInt32());
         break;
-      case kWebRTCStatsMemberTypeSequenceUint32:
+      case webrtc::RTCStatsMemberInterface::kSequenceUint32:
         add_vector(name, member->ValueSequenceUint32());
         break;
-      case kWebRTCStatsMemberTypeSequenceInt64:
+      case webrtc::RTCStatsMemberInterface::kSequenceInt64:
         add_vector(name, member->ValueSequenceInt64());
         break;
-      case kWebRTCStatsMemberTypeSequenceUint64:
+      case webrtc::RTCStatsMemberInterface::kSequenceUint64:
         add_vector(name, member->ValueSequenceUint64());
         break;
-      case kWebRTCStatsMemberTypeSequenceDouble:
+      case webrtc::RTCStatsMemberInterface::kSequenceDouble:
         add_vector(name, member->ValueSequenceDouble());
         break;
-      case kWebRTCStatsMemberTypeSequenceString:
+      case webrtc::RTCStatsMemberInterface::kSequenceString:
         add_vector(name, member->ValueSequenceString());
         break;
       default:

third_party/blink/renderer/platform/peerconnection/rtc_stats.cc

@@ -229,40 +229,8 @@ blink::WebString RTCStatsMember::GetName() const {
   return blink::WebString::FromUTF8(member_->name());
 }
 
-blink::WebRTCStatsMemberType RTCStatsMember::GetType() const {
-  switch (member_->type()) {
-    case webrtc::RTCStatsMemberInterface::kBool:
-      return blink::kWebRTCStatsMemberTypeBool;
-    case webrtc::RTCStatsMemberInterface::kInt32:
-      return blink::kWebRTCStatsMemberTypeInt32;
-    case webrtc::RTCStatsMemberInterface::kUint32:
-      return blink::kWebRTCStatsMemberTypeUint32;
-    case webrtc::RTCStatsMemberInterface::kInt64:
-      return blink::kWebRTCStatsMemberTypeInt64;
-    case webrtc::RTCStatsMemberInterface::kUint64:
-      return blink::kWebRTCStatsMemberTypeUint64;
-    case webrtc::RTCStatsMemberInterface::kDouble:
-      return blink::kWebRTCStatsMemberTypeDouble;
-    case webrtc::RTCStatsMemberInterface::kString:
-      return blink::kWebRTCStatsMemberTypeString;
-    case webrtc::RTCStatsMemberInterface::kSequenceBool:
-      return blink::kWebRTCStatsMemberTypeSequenceBool;
-    case webrtc::RTCStatsMemberInterface::kSequenceInt32:
-      return blink::kWebRTCStatsMemberTypeSequenceInt32;
-    case webrtc::RTCStatsMemberInterface::kSequenceUint32:
-      return blink::kWebRTCStatsMemberTypeSequenceUint32;
-    case webrtc::RTCStatsMemberInterface::kSequenceInt64:
-      return blink::kWebRTCStatsMemberTypeSequenceInt64;
-    case webrtc::RTCStatsMemberInterface::kSequenceUint64:
-      return blink::kWebRTCStatsMemberTypeSequenceUint64;
-    case webrtc::RTCStatsMemberInterface::kSequenceDouble:
-      return blink::kWebRTCStatsMemberTypeSequenceDouble;
-    case webrtc::RTCStatsMemberInterface::kSequenceString:
-      return blink::kWebRTCStatsMemberTypeSequenceString;
-    default:
-      NOTREACHED();
-      return blink::kWebRTCStatsMemberTypeSequenceInt32;
-  }
+webrtc::RTCStatsMemberInterface::Type RTCStatsMember::GetType() const {
+  return member_->type();
 }
 
 bool RTCStatsMember::IsDefined() const {

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

@@ -79,7 +79,7 @@ class PLATFORM_EXPORT RTCStatsMember : public blink::WebRTCStatsMember {
   ~RTCStatsMember() override;
 
   blink::WebString GetName() const override;
-  blink::WebRTCStatsMemberType GetType() const override;
+  webrtc::RTCStatsMemberInterface::Type GetType() const override;
   bool IsDefined() const override;
 
   bool ValueBool() const override;