Switch RTCLegacyStats away from WebString

The CL also changes RTCLegacyStatsMemberIterator similarly.

BUG=787254
R=guidou@chormium.org

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

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

@@ -366,8 +366,8 @@ class StatsResponse : public webrtc::StatsObserver {
       // RTCLegacyStatsMemberIterator
       bool IsEnd() const override { return it_ == end_; }
       void Next() override { ++it_; }
-      blink::WebString GetName() const override {
-        return blink::WebString::FromUTF8(it_->second->display_name());
+      String GetName() const override {
+        return String::FromUTF8(it_->second->display_name());
       }
       RTCLegacyStatsMemberType GetType() const override {
         return RTCLegacyStatsMemberTypeFromStatsValueType(it_->second->type());
@@ -375,21 +375,21 @@ class StatsResponse : public webrtc::StatsObserver {
       int ValueInt() const override { return it_->second->int_val(); }
       int64_t ValueInt64() const override { return it_->second->int64_val(); }
       float ValueFloat() const override { return it_->second->float_val(); }
-      blink::WebString ValueString() const override {
+      String ValueString() const override {
         const StatsReport::ValuePtr& value = it_->second;
         if (value->type() == StatsReport::Value::kString)
-          return blink::WebString::FromUTF8(value->string_val());
+          return String::FromUTF8(value->string_val());
         DCHECK_EQ(value->type(), StatsReport::Value::kStaticString);
-        return blink::WebString::FromUTF8(value->static_string_val());
+        return String::FromUTF8(value->static_string_val());
       }
       bool ValueBool() const override { return it_->second->bool_val(); }
-      blink::WebString ValueToString() const override {
+      String ValueToString() const override {
         const StatsReport::ValuePtr& value = it_->second;
         if (value->type() == StatsReport::Value::kString)
-          return blink::WebString::FromUTF8(value->string_val());
+          return String::FromUTF8(value->string_val());
         if (value->type() == StatsReport::Value::kStaticString)
-          return blink::WebString::FromUTF8(value->static_string_val());
-        return blink::WebString::FromUTF8(value->ToString());
+          return String::FromUTF8(value->static_string_val());
+        return String::FromUTF8(value->ToString());
       }
 
      private:
@@ -411,12 +411,8 @@ class StatsResponse : public webrtc::StatsObserver {
     }
 
     // RTCLegacyStats
-    blink::WebString Id() const override {
-      return blink::WebString::FromUTF8(id_);
-    }
-    blink::WebString GetType() const override {
-      return blink::WebString::FromUTF8(type_name_);
-    }
+    String Id() const override { return String::FromUTF8(id_); }
+    String GetType() const override { return String::FromUTF8(type_name_); }
     double Timestamp() const override { return timestamp_; }
     RTCLegacyStatsMemberIterator* Iterator() const override {
       return new MemberIterator(values_.cbegin(), values_.cend());

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

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_PEERCONNECTION_RTC_LEGACY_STATS_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_PEERCONNECTION_RTC_LEGACY_STATS_H_
 
-#include "third_party/blink/public/platform/web_string.h"
+#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 
 namespace blink {
 
@@ -29,8 +29,8 @@ class RTCLegacyStats {
  public:
   virtual ~RTCLegacyStats() = default;
 
-  virtual WebString Id() const = 0;
-  virtual WebString GetType() const = 0;
+  virtual String Id() const = 0;
+  virtual String GetType() const = 0;
   virtual double Timestamp() const = 0;
 
   // The caller owns the iterator. The iterator must not be used after
@@ -44,18 +44,18 @@ class RTCLegacyStatsMemberIterator {
   virtual bool IsEnd() const = 0;
   virtual void Next() = 0;
 
-  virtual WebString GetName() const = 0;
+  virtual String GetName() const = 0;
   virtual RTCLegacyStatsMemberType 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 WebString ValueString() const = 0;  // kRTCLegacyStatsMemberTypeString
+  virtual String ValueString() const = 0;     // kRTCLegacyStatsMemberTypeString
   virtual bool ValueBool() const = 0;         // kRTCLegacyStatsMemberTypeBool
 
   // Converts the value to string (regardless of |type|).
-  virtual WebString ValueToString() const = 0;
+  virtual String ValueToString() const = 0;
 };
 
 }  // namespace blink