Switch renderer/platform/peerconnection/rtc_stats* away from WebString

Use WTF::String instead, now that the classes are solely used
within Blink.

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

Change-Id: I0b43eefea87bf48367903a935ee06bb22f245113
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1906507
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713944}

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

@@ -971,7 +971,7 @@ TEST_F(RTCPeerConnectionHandlerTest, GetRTCStats) {
             EXPECT_EQ(member->ValueDouble(), 42.0);
             break;
           case webrtc::RTCStatsMemberInterface::kString:
-            EXPECT_EQ(member->ValueString(), blink::WebString::FromUTF8("42"));
+            EXPECT_EQ(member->ValueString(), "42");
             break;
           case webrtc::RTCStatsMemberInterface::kSequenceBool:
             ExpectSequenceEquals(member->ValueSequenceBool(), 1);
@@ -997,7 +997,7 @@ TEST_F(RTCPeerConnectionHandlerTest, GetRTCStats) {
             break;
           case webrtc::RTCStatsMemberInterface::kSequenceString:
             ExpectSequenceEquals(member->ValueSequenceString(),
-                                 blink::WebString::FromUTF8("42"));
+                                 String::FromUTF8("42"));
             break;
           default:
             NOTREACHED();

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

@@ -138,7 +138,7 @@ std::unique_ptr<RTCStatsReportPlatform> RTCStatsReportPlatform::CopyHandle()
 }
 
 std::unique_ptr<RTCStats> RTCStatsReportPlatform::GetStats(
-    blink::WebString id) const {
+    const String& id) const {
   const webrtc::RTCStats* stats = stats_report_->Get(id.Utf8());
   if (!stats || !IsWhitelistedStats(*stats))
     return std::unique_ptr<RTCStats>();
@@ -175,12 +175,12 @@ RTCStats::RTCStats(
 
 RTCStats::~RTCStats() {}
 
-blink::WebString RTCStats::Id() const {
-  return blink::WebString::FromUTF8(stats_->id());
+String RTCStats::Id() const {
+  return String::FromUTF8(stats_->id());
 }
 
-blink::WebString RTCStats::GetType() const {
-  return blink::WebString::FromUTF8(stats_->type());
+String RTCStats::GetType() const {
+  return String::FromUTF8(stats_->type());
 }
 
 double RTCStats::Timestamp() const {
@@ -207,8 +207,8 @@ RTCStatsMember::RTCStatsMember(
 
 RTCStatsMember::~RTCStatsMember() {}
 
-blink::WebString RTCStatsMember::GetName() const {
-  return blink::WebString::FromUTF8(member_->name());
+String RTCStatsMember::GetName() const {
+  return String::FromUTF8(member_->name());
 }
 
 webrtc::RTCStatsMemberInterface::Type RTCStatsMember::GetType() const {
@@ -249,9 +249,9 @@ double RTCStatsMember::ValueDouble() const {
   return *member_->cast_to<webrtc::RTCStatsMember<double>>();
 }
 
-blink::WebString RTCStatsMember::ValueString() const {
+String RTCStatsMember::ValueString() const {
   DCHECK(IsDefined());
-  return blink::WebString::FromUTF8(
+  return String::FromUTF8(
       *member_->cast_to<webrtc::RTCStatsMember<std::string>>());
 }
 
@@ -297,13 +297,13 @@ blink::WebVector<double> RTCStatsMember::ValueSequenceDouble() const {
       *member_->cast_to<webrtc::RTCStatsMember<std::vector<double>>>());
 }
 
-blink::WebVector<blink::WebString> RTCStatsMember::ValueSequenceString() const {
+blink::WebVector<String> RTCStatsMember::ValueSequenceString() const {
   DCHECK(IsDefined());
   const std::vector<std::string>& sequence =
       *member_->cast_to<webrtc::RTCStatsMember<std::vector<std::string>>>();
-  blink::WebVector<blink::WebString> web_sequence(sequence.size());
+  blink::WebVector<String> web_sequence(sequence.size());
   for (size_t i = 0; i < sequence.size(); ++i)
-    web_sequence[i] = blink::WebString::FromUTF8(sequence[i]);
+    web_sequence[i] = String::FromUTF8(sequence[i]);
   return web_sequence;
 }
 

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

@@ -9,6 +9,7 @@
 #include "base/single_thread_task_runner.h"
 #include "third_party/blink/public/platform/web_rtc_stats.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
+#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 #include "third_party/webrtc/api/stats/rtc_stats.h"
 #include "third_party/webrtc/api/stats/rtc_stats_collector_callback.h"
 #include "third_party/webrtc/api/stats/rtc_stats_report.h"
@@ -27,8 +28,7 @@ class RTCStatsMember;
 // |RTCStatsReport|, from renderer/modules/peerconnection/rtc_stats_report.cc|h.
 //
 // TODO(crbug.com/787254): Switch over the classes below from using WebVector
-// and WebString to WTF::Vector and WTF::String, when their respective parent
-// classes are gone.
+// to WTF::Vector, when their respective parent classes are gone.
 class PLATFORM_EXPORT RTCStatsReportPlatform {
  public:
   RTCStatsReportPlatform(
@@ -41,7 +41,7 @@ class PLATFORM_EXPORT RTCStatsReportPlatform {
   std::unique_ptr<RTCStatsReportPlatform> CopyHandle() const;
 
   // Gets stats object by |id|, or null if no stats with that |id| exists.
-  std::unique_ptr<RTCStats> GetStats(blink::WebString id) const;
+  std::unique_ptr<RTCStats> GetStats(const String& id) const;
 
   // The next stats object, or null if the end has been reached.
   std::unique_ptr<RTCStats> Next();
@@ -66,8 +66,8 @@ class PLATFORM_EXPORT RTCStats {
       const blink::WebVector<webrtc::NonStandardGroupId>& exposed_group_ids);
   virtual ~RTCStats();
 
-  blink::WebString Id() const;
-  blink::WebString GetType() const;
+  String Id() const;
+  String GetType() const;
   double Timestamp() const;
 
   size_t MembersCount() const;
@@ -88,7 +88,7 @@ class PLATFORM_EXPORT RTCStatsMember {
                  const webrtc::RTCStatsMemberInterface* member);
   virtual ~RTCStatsMember();
 
-  blink::WebString GetName() const;
+  String GetName() const;
   webrtc::RTCStatsMemberInterface::Type GetType() const;
   bool IsDefined() const;
 
@@ -98,14 +98,14 @@ class PLATFORM_EXPORT RTCStatsMember {
   int64_t ValueInt64() const;
   uint64_t ValueUint64() const;
   double ValueDouble() const;
-  blink::WebString ValueString() const;
+  String ValueString() const;
   blink::WebVector<int> ValueSequenceBool() const;
   blink::WebVector<int32_t> ValueSequenceInt32() const;
   blink::WebVector<uint32_t> ValueSequenceUint32() const;
   blink::WebVector<int64_t> ValueSequenceInt64() const;
   blink::WebVector<uint64_t> ValueSequenceUint64() const;
   blink::WebVector<double> ValueSequenceDouble() const;
-  blink::WebVector<blink::WebString> ValueSequenceString() const;
+  blink::WebVector<String> ValueSequenceString() const;
 
  private:
   // Reference to keep the report that owns |member_|'s stats object alive.

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

@@ -26,8 +26,8 @@ TEST(RTCStatsTest, OnlyIncludeWhitelistedStats_GetStats) {
       new webrtc::RTCPeerConnectionStats(whitelisted_id, 42)));
 
   RTCStatsReportPlatform report(webrtc_report.get(), {});
-  EXPECT_FALSE(report.GetStats(blink::WebString::FromUTF8(not_whitelisted_id)));
-  EXPECT_TRUE(report.GetStats(blink::WebString::FromUTF8(whitelisted_id)));
+  EXPECT_FALSE(report.GetStats(not_whitelisted_id));
+  EXPECT_TRUE(report.GetStats(whitelisted_id));
 }
 
 TEST(RTCStatsTest, OnlyIncludeWhitelistedStats_Iteration) {