Switch BaseConstraint (and children) away from WebString and WebVector

... to use WTF::String and WTF::Vector instead.

This is now possible after moving web_media_constraints.h out of the
Blink API layer (crrev.com/1976214).

BUG=704136
R=guidou@chromium.org

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

third_party/blink/renderer/modules/mediastream/media_constraints_impl.cc

@@ -30,6 +30,7 @@
 
 #include "third_party/blink/renderer/modules/mediastream/media_constraints_impl.h"
 
+#include "third_party/blink/public/platform/web_string.h"
 #include "third_party/blink/renderer/bindings/core/v8/array_value.h"
 #include "third_party/blink/renderer/bindings/core/v8/dictionary.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"

third_party/blink/renderer/modules/mediastream/media_constraints_test.cc

@@ -106,7 +106,7 @@ TEST(MediaTrackConstraintsTest, SetToString) {
 TEST(MediaTrackConstraintsTest, ConstraintsToString) {
   MediaConstraints the_constraints;
   WebMediaTrackConstraintSet basic;
-  WebVector<WebMediaTrackConstraintSet> advanced(static_cast<size_t>(1));
+  Vector<WebMediaTrackConstraintSet> advanced(static_cast<size_t>(1));
   basic.width.SetMax(240);
   advanced[0].echo_cancellation.SetExact(true);
   the_constraints.Initialize(basic, advanced);
@@ -129,7 +129,7 @@ TEST(MediaTrackConstraintsTest, ConvertWebSingleStringConstraint) {
   MediaConstraints input;
 
   WebMediaTrackConstraintSet basic;
-  WebVector<WebMediaTrackConstraintSet> advanced;
+  Vector<WebMediaTrackConstraintSet> advanced;
 
   basic.facing_mode.SetIdeal(Vector<String>({"foo"}));
   input.Initialize(basic, advanced);
@@ -148,7 +148,7 @@ TEST(MediaTrackConstraintsTest, ConvertWebDoubleStringConstraint) {
   buffer[1] = "bar";
 
   WebMediaTrackConstraintSet basic;
-  std::vector<WebMediaTrackConstraintSet> advanced;
+  Vector<WebMediaTrackConstraintSet> advanced;
   basic.facing_mode.SetIdeal(buffer);
   input.Initialize(basic, advanced);
 
@@ -234,7 +234,7 @@ TEST(MediaTrackConstraintsTest, IdealAndExactConvertToNaked) {
   advanced_element1.facing_mode.SetIdeal(buffer);
   buffer[0] = "exact";
   advanced_element2.facing_mode.SetExact(buffer);
-  std::vector<WebMediaTrackConstraintSet> advanced;
+  Vector<WebMediaTrackConstraintSet> advanced;
   advanced.push_back(advanced_element1);
   advanced.push_back(advanced_element2);
   input.Initialize(basic, advanced);

third_party/blink/renderer/modules/mediastream/user_media_request.cc

@@ -348,8 +348,8 @@ UserMediaRequest* UserMediaRequest::Create(
     // either a dictionary value or a value of true.
     // 4. If requestedMediaTypes is the empty set, set requestedMediaTypes to a
     // set containing "video".
-    if ((!audio.IsNull() && !audio.Advanced().empty()) ||
-        (!video.IsNull() && !video.Advanced().empty())) {
+    if ((!audio.IsNull() && !audio.Advanced().IsEmpty()) ||
+        (!video.IsNull() && !video.Advanced().IsEmpty())) {
       error_state.ThrowTypeError("Advanced constraints are not supported");
       return nullptr;
     }

third_party/blink/renderer/platform/mediastream/media_constraints.cc

@@ -82,50 +82,49 @@ class MediaConstraintsPrivate final
   static scoped_refptr<MediaConstraintsPrivate> Create();
   static scoped_refptr<MediaConstraintsPrivate> Create(
       const WebMediaTrackConstraintSet& basic,
-      const WebVector<WebMediaTrackConstraintSet>& advanced);
+      const Vector<WebMediaTrackConstraintSet>& advanced);
 
   bool IsEmpty() const;
   const WebMediaTrackConstraintSet& Basic() const;
-  const WebVector<WebMediaTrackConstraintSet>& Advanced() const;
+  const Vector<WebMediaTrackConstraintSet>& Advanced() const;
   const String ToString() const;
 
  private:
-  MediaConstraintsPrivate(
-      const WebMediaTrackConstraintSet& basic,
-      const WebVector<WebMediaTrackConstraintSet>& advanced);
+  MediaConstraintsPrivate(const WebMediaTrackConstraintSet& basic,
+                          const Vector<WebMediaTrackConstraintSet>& advanced);
 
   WebMediaTrackConstraintSet basic_;
-  WebVector<WebMediaTrackConstraintSet> advanced_;
+  Vector<WebMediaTrackConstraintSet> advanced_;
 };
 
 scoped_refptr<MediaConstraintsPrivate> MediaConstraintsPrivate::Create() {
   WebMediaTrackConstraintSet basic;
-  WebVector<WebMediaTrackConstraintSet> advanced;
+  Vector<WebMediaTrackConstraintSet> advanced;
   return base::AdoptRef(new MediaConstraintsPrivate(basic, advanced));
 }
 
 scoped_refptr<MediaConstraintsPrivate> MediaConstraintsPrivate::Create(
     const WebMediaTrackConstraintSet& basic,
-    const WebVector<WebMediaTrackConstraintSet>& advanced) {
+    const Vector<WebMediaTrackConstraintSet>& advanced) {
   return base::AdoptRef(new MediaConstraintsPrivate(basic, advanced));
 }
 
 MediaConstraintsPrivate::MediaConstraintsPrivate(
     const WebMediaTrackConstraintSet& basic,
-    const WebVector<WebMediaTrackConstraintSet>& advanced)
+    const Vector<WebMediaTrackConstraintSet>& advanced)
     : basic_(basic), advanced_(advanced) {}
 
 bool MediaConstraintsPrivate::IsEmpty() const {
   // TODO(hta): When generating advanced constraints, make sure no empty
   // elements can be added to the m_advanced vector.
-  return basic_.IsEmpty() && advanced_.empty();
+  return basic_.IsEmpty() && advanced_.IsEmpty();
 }
 
 const WebMediaTrackConstraintSet& MediaConstraintsPrivate::Basic() const {
   return basic_;
 }
 
-const WebVector<WebMediaTrackConstraintSet>& MediaConstraintsPrivate::Advanced()
+const Vector<WebMediaTrackConstraintSet>& MediaConstraintsPrivate::Advanced()
     const {
   return advanced_;
 }
@@ -135,7 +134,7 @@ const String MediaConstraintsPrivate::ToString() const {
   if (!IsEmpty()) {
     builder.Append('{');
     builder.Append(Basic().ToString());
-    if (!Advanced().empty()) {
+    if (!Advanced().IsEmpty()) {
       if (builder.length() > 1)
         builder.Append(", ");
       builder.Append("advanced: [");
@@ -193,7 +192,7 @@ bool LongConstraint::IsEmpty() const {
   return !has_min_ && !has_max_ && !has_exact_ && !has_ideal_;
 }
 
-WebString LongConstraint::ToString() const {
+String LongConstraint::ToString() const {
   StringBuilder builder;
   builder.Append('{');
   MaybeEmitNamedValue(builder, has_min_, "min", min_);
@@ -235,7 +234,7 @@ bool DoubleConstraint::IsEmpty() const {
   return !has_min_ && !has_max_ && !has_exact_ && !has_ideal_;
 }
 
-WebString DoubleConstraint::ToString() const {
+String DoubleConstraint::ToString() const {
   StringBuilder builder;
   builder.Append('{');
   MaybeEmitNamedValue(builder, has_min_, "min", min_);
@@ -273,7 +272,7 @@ const Vector<String>& StringConstraint::Ideal() const {
   return ideal_;
 }
 
-WebString StringConstraint::ToString() const {
+String StringConstraint::ToString() const {
   StringBuilder builder;
   builder.Append('{');
   if (!ideal_.IsEmpty()) {
@@ -325,7 +324,7 @@ bool BooleanConstraint::IsEmpty() const {
   return !has_ideal_ && !has_exact_;
 }
 
-WebString BooleanConstraint::ToString() const {
+String BooleanConstraint::ToString() const {
   StringBuilder builder;
   builder.Append('{');
   MaybeEmitNamedBoolean(builder, has_exact_, "exact", Exact());
@@ -490,7 +489,7 @@ bool WebMediaTrackConstraintSet::HasExact() const {
   return false;
 }
 
-WebString WebMediaTrackConstraintSet::ToString() const {
+String WebMediaTrackConstraintSet::ToString() const {
   StringBuilder builder;
   bool first = true;
   for (auto* const constraint : AllConstraints()) {
@@ -527,7 +526,7 @@ void MediaConstraints::Initialize() {
 
 void MediaConstraints::Initialize(
     const WebMediaTrackConstraintSet& basic,
-    const WebVector<WebMediaTrackConstraintSet>& advanced) {
+    const Vector<WebMediaTrackConstraintSet>& advanced) {
   DCHECK(IsNull());
   private_ = MediaConstraintsPrivate::Create(basic, advanced);
 }
@@ -537,15 +536,14 @@ const WebMediaTrackConstraintSet& MediaConstraints::Basic() const {
   return private_->Basic();
 }
 
-const WebVector<WebMediaTrackConstraintSet>& MediaConstraints::Advanced()
-    const {
+const Vector<WebMediaTrackConstraintSet>& MediaConstraints::Advanced() const {
   DCHECK(!IsNull());
   return private_->Advanced();
 }
 
-const WebString MediaConstraints::ToString() const {
+const String MediaConstraints::ToString() const {
   if (IsNull())
-    return WebString("");
+    return String("");
   return private_->ToString();
 }
 

third_party/blink/renderer/platform/mediastream/media_constraints.h

@@ -35,8 +35,6 @@
 #include <vector>
 
 #include "third_party/blink/public/platform/web_private_ptr.h"
-#include "third_party/blink/public/platform/web_string.h"
-#include "third_party/blink/public/platform/web_vector.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 #include "third_party/blink/renderer/platform/wtf/vector.h"
@@ -60,7 +58,7 @@ class PLATFORM_EXPORT BaseConstraint {
   virtual bool HasMax() const { return false; }
   virtual bool HasExact() const = 0;
   const char* GetName() const { return name_; }
-  virtual WebString ToString() const = 0;
+  virtual String ToString() const = 0;
 
  private:
   const char* name_;
@@ -97,7 +95,7 @@ class PLATFORM_EXPORT LongConstraint : public BaseConstraint {
   bool HasMin() const override { return has_min_; }
   bool HasMax() const override { return has_max_; }
   bool HasExact() const override { return has_exact_; }
-  WebString ToString() const override;
+  String ToString() const override;
   int32_t Min() const { return min_; }
   int32_t Max() const { return max_; }
   int32_t Exact() const { return exact_; }
@@ -149,7 +147,7 @@ class PLATFORM_EXPORT DoubleConstraint : public BaseConstraint {
   bool HasMin() const override { return has_min_; }
   bool HasMax() const override { return has_max_; }
   bool HasExact() const override { return has_exact_; }
-  WebString ToString() const override;
+  String ToString() const override;
   double Min() const { return min_; }
   double Max() const { return max_; }
   double Exact() const { return exact_; }
@@ -184,7 +182,7 @@ class PLATFORM_EXPORT StringConstraint : public BaseConstraint {
   bool Matches(String value) const;
   bool IsEmpty() const override;
   bool HasExact() const override { return !exact_.IsEmpty(); }
-  WebString ToString() const override;
+  String ToString() const override;
   bool HasIdeal() const { return !ideal_.IsEmpty(); }
   const Vector<String>& Exact() const;
   const Vector<String>& Ideal() const;
@@ -213,7 +211,7 @@ class PLATFORM_EXPORT BooleanConstraint : public BaseConstraint {
   bool Matches(bool value) const;
   bool IsEmpty() const override;
   bool HasExact() const override { return has_exact_; }
-  WebString ToString() const override;
+  String ToString() const override;
   bool HasIdeal() const { return has_ideal_; }
 
  private:
@@ -288,7 +286,7 @@ struct WebMediaTrackConstraintSet {
                                               std::string&) const;
   PLATFORM_EXPORT bool HasMin() const;
   PLATFORM_EXPORT bool HasExact() const;
-  PLATFORM_EXPORT WebString ToString() const;
+  PLATFORM_EXPORT String ToString() const;
 
  private:
   std::vector<const BaseConstraint*> AllConstraints() const;
@@ -314,12 +312,12 @@ class MediaConstraints {
   PLATFORM_EXPORT void Initialize();
   PLATFORM_EXPORT void Initialize(
       const WebMediaTrackConstraintSet& basic,
-      const WebVector<WebMediaTrackConstraintSet>& advanced);
+      const Vector<WebMediaTrackConstraintSet>& advanced);
 
   PLATFORM_EXPORT const WebMediaTrackConstraintSet& Basic() const;
-  PLATFORM_EXPORT const WebVector<WebMediaTrackConstraintSet>& Advanced() const;
+  PLATFORM_EXPORT const Vector<WebMediaTrackConstraintSet>& Advanced() const;
 
-  PLATFORM_EXPORT const WebString ToString() const;
+  PLATFORM_EXPORT const String ToString() const;
 
  private:
   WebPrivatePtr<MediaConstraintsPrivate> private_;