Remove static Create() in renderer/platform/mediastream

As advised in [1], this CL removes unnecessary Foo::Create() factory
functions which return an instance created by MakeGarbageCollected<Foo>
in third_party/blink/renderer/platform/mediastream, then this CL makes
the callers use MakeGarbageCollected<Foo> instead of Foo::Create()
factory functions.

[1] https://groups.google.com/a/chromium.org/forum/#!msg/blink-dev/iJ1bawbx>

Bug: 939691
Change-Id: I3e86523a6f71145ba7d80cd2c8a1f4c4dcb55e9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1554357Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Cr-Commit-Position: refs/heads/master@{#648599}

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

@@ -31,6 +31,7 @@
 #include "third_party/blink/renderer/modules/mediastream/media_stream_track_event.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
+#include "third_party/blink/renderer/platform/heap/heap.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_center.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_source.h"
 
@@ -185,8 +186,8 @@ MediaStream::MediaStream(ExecutionContext* context,
     video_components.push_back((*iter)->Component());
   }
 
-  descriptor_ =
-      MediaStreamDescriptor::Create(audio_components, video_components);
+  descriptor_ = MakeGarbageCollected<MediaStreamDescriptor>(audio_components,
+                                                            video_components);
   descriptor_->SetClient(this);
 
   audio_tracks_ = audio_tracks;

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

@@ -113,6 +113,7 @@
 #include "third_party/blink/renderer/platform/bindings/microtask.h"
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
 #include "third_party/blink/renderer/platform/bindings/v8_throw_exception.h"
+#include "third_party/blink/renderer/platform/heap/heap.h"
 #include "third_party/blink/renderer/platform/instance_counters.h"
 #include "third_party/blink/renderer/platform/peerconnection/rtc_answer_options_platform.h"
 #include "third_party/blink/renderer/platform/peerconnection/rtc_offer_options_platform.h"
@@ -2659,7 +2660,7 @@ void RTCPeerConnection::DidAddReceiverPlanB(
         video_track_components.push_back(track->Component());
         video_tracks.push_back(track);
       }
-      MediaStreamDescriptor* descriptor = MediaStreamDescriptor::Create(
+      auto* descriptor = MakeGarbageCollected<MediaStreamDescriptor>(
           stream_id, std::move(audio_track_components),
           std::move(video_track_components));
       stream =
@@ -2865,8 +2866,10 @@ void RTCPeerConnection::SetAssociatedMediaStreams(
     }
     if (!curr_stream) {
       curr_stream = MediaStream::Create(
-          GetExecutionContext(), MediaStreamDescriptor::Create(
-                                     static_cast<String>(stream_id), {}, {}));
+          GetExecutionContext(),
+          MakeGarbageCollected<MediaStreamDescriptor>(
+              static_cast<String>(stream_id), MediaStreamComponentVector(),
+              MediaStreamComponentVector()));
     }
     streams.push_back(curr_stream);
   }

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

@@ -30,6 +30,7 @@
 #include "third_party/blink/renderer/modules/peerconnection/rtc_ice_server.h"
 #include "third_party/blink/renderer/modules/peerconnection/rtc_offer_options.h"
 #include "third_party/blink/renderer/modules/peerconnection/rtc_session_description_init.h"
+#include "third_party/blink/renderer/platform/heap/heap.h"
 #include "third_party/blink/renderer/platform/heap/heap_allocator.h"
 #include "third_party/blink/renderer/platform/testing/testing_platform_support.h"
 #include "third_party/blink/renderer/platform/testing/testing_platform_support_with_web_rtc.h"
@@ -391,9 +392,9 @@ class RTCPeerConnectionTestWithPlatformTestingPlatformType
   MediaStreamTrack* CreateTrack(V8TestingScope& scope,
                                 MediaStreamSource::StreamType type,
                                 String id) {
-    MediaStreamSource* source =
-        MediaStreamSource::Create("sourceId", type, "sourceName", false);
-    MediaStreamComponent* component = MediaStreamComponent::Create(id, source);
+    auto* source = MakeGarbageCollected<MediaStreamSource>("sourceId", type,
+                                                           "sourceName", false);
+    auto* component = MakeGarbageCollected<MediaStreamComponent>(id, source);
     return MediaStreamTrack::Create(scope.GetExecutionContext(), component);
   }
 

third_party/blink/renderer/modules/webaudio/media_stream_audio_destination_node.cc

@@ -32,6 +32,7 @@
 #include "third_party/blink/renderer/modules/webaudio/base_audio_context.h"
 #include "third_party/blink/renderer/platform/bindings/exception_messages.h"
 #include "third_party/blink/renderer/platform/bindings/exception_state.h"
+#include "third_party/blink/renderer/platform/heap/heap.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_center.h"
 #include "third_party/blink/renderer/platform/uuid.h"
 #include "third_party/blink/renderer/platform/wtf/locker.h"
@@ -132,15 +133,15 @@ MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode(
     AudioContext& context,
     uint32_t number_of_channels)
     : AudioBasicInspectorNode(context),
-      source_(
-          MediaStreamSource::Create("WebAudio-" + CreateCanonicalUUIDString(),
-                                    MediaStreamSource::kTypeAudio,
-                                    "MediaStreamAudioDestinationNode",
-                                    false,
-                                    MediaStreamSource::kReadyStateLive,
-                                    true)),
+      source_(MakeGarbageCollected<MediaStreamSource>(
+          "WebAudio-" + CreateCanonicalUUIDString(),
+          MediaStreamSource::kTypeAudio,
+          "MediaStreamAudioDestinationNode",
+          false,
+          MediaStreamSource::kReadyStateLive,
+          true)),
       stream_(MediaStream::Create(context.GetExecutionContext(),
-                                  MediaStreamDescriptor::Create(
+                                  MakeGarbageCollected<MediaStreamDescriptor>(
                                       MediaStreamSourceVector({source_.Get()}),
                                       MediaStreamSourceVector()))) {
   MediaStreamCenter::Instance().DidCreateMediaStreamAndTracks(

third_party/blink/renderer/platform/exported/web_media_stream.cc

@@ -28,6 +28,7 @@
 #include "third_party/blink/public/platform/web_media_stream_source.h"
 #include "third_party/blink/public/platform/web_media_stream_track.h"
 #include "third_party/blink/public/platform/web_string.h"
+#include "third_party/blink/renderer/platform/heap/heap.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_component.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_descriptor.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_source.h"
@@ -143,7 +144,7 @@ void WebMediaStream::Initialize(
     MediaStreamComponent* component = video_tracks[i];
     video.push_back(component);
   }
-  private_ = MediaStreamDescriptor::Create(label, audio, video);
+  private_ = MakeGarbageCollected<MediaStreamDescriptor>(label, audio, video);
 }
 
 void WebMediaStream::Assign(const WebMediaStream& other) {

third_party/blink/renderer/platform/exported/web_media_stream_source.cc

@@ -38,6 +38,7 @@
 #include "third_party/blink/public/platform/web_media_constraints.h"
 #include "third_party/blink/public/platform/web_string.h"
 #include "third_party/blink/renderer/platform/audio/audio_bus.h"
+#include "third_party/blink/renderer/platform/heap/heap.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_source.h"
 #include "third_party/blink/renderer/platform/wtf/vector.h"
 
@@ -69,7 +70,7 @@ void WebMediaStreamSource::Initialize(const WebString& id,
                                       Type type,
                                       const WebString& name,
                                       bool remote) {
-  private_ = MediaStreamSource::Create(
+  private_ = MakeGarbageCollected<MediaStreamSource>(
       id, static_cast<MediaStreamSource::StreamType>(type), name, remote);
 }
 

third_party/blink/renderer/platform/exported/web_media_stream_track.cc

@@ -33,6 +33,7 @@
 #include "third_party/blink/public/platform/web_media_stream.h"
 #include "third_party/blink/public/platform/web_media_stream_source.h"
 #include "third_party/blink/public/platform/web_string.h"
+#include "third_party/blink/renderer/platform/heap/heap.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_component.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_source.h"
 
@@ -52,12 +53,12 @@ WebMediaStreamTrack& WebMediaStreamTrack::operator=(
 }
 
 void WebMediaStreamTrack::Initialize(const WebMediaStreamSource& source) {
-  private_ = MediaStreamComponent::Create(source);
+  private_ = MakeGarbageCollected<MediaStreamComponent>(source);
 }
 
 void WebMediaStreamTrack::Initialize(const WebString& id,
                                      const WebMediaStreamSource& source) {
-  private_ = MediaStreamComponent::Create(id, source);
+  private_ = MakeGarbageCollected<MediaStreamComponent>(id, source);
 }
 
 void WebMediaStreamTrack::Reset() {

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

@@ -34,6 +34,7 @@
 #include "third_party/blink/public/platform/web_audio_source_provider.h"
 #include "third_party/blink/public/platform/web_media_stream_track.h"
 #include "third_party/blink/renderer/platform/audio/audio_bus.h"
+#include "third_party/blink/renderer/platform/heap/heap.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_center.h"
 #include "third_party/blink/renderer/platform/mediastream/media_stream_source.h"
 #include "third_party/blink/renderer/platform/uuid.h"
@@ -51,16 +52,8 @@ int MediaStreamComponent::GenerateUniqueId() {
   return ++g_unique_media_stream_component_id;
 }
 
-MediaStreamComponent* MediaStreamComponent::Create(MediaStreamSource* source) {
-  return MakeGarbageCollected<MediaStreamComponent>(CreateCanonicalUUIDString(),
-                                                    source);
-}
-
-MediaStreamComponent* MediaStreamComponent::Create(const String& id,
-                                                   MediaStreamSource* source) {
-  return MakeGarbageCollected<MediaStreamComponent>(id, source);
-}
-
+MediaStreamComponent::MediaStreamComponent(MediaStreamSource* source)
+    : MediaStreamComponent(CreateCanonicalUUIDString(), source) {}
 MediaStreamComponent::MediaStreamComponent(const String& id,
                                            MediaStreamSource* source)
     : source_(source), id_(id), unique_id_(GenerateUniqueId()) {
@@ -69,9 +62,7 @@ MediaStreamComponent::MediaStreamComponent(const String& id,
 }
 
 MediaStreamComponent* MediaStreamComponent::Clone() const {
-  MediaStreamComponent* cloned_component =
-      MakeGarbageCollected<MediaStreamComponent>(CreateCanonicalUUIDString(),
-                                                 Source());
+  auto* cloned_component = MakeGarbageCollected<MediaStreamComponent>(Source());
   cloned_component->SetEnabled(enabled_);
   cloned_component->SetMuted(muted_);
   cloned_component->SetContentHint(content_hint_);

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

@@ -59,9 +59,7 @@ class PLATFORM_EXPORT MediaStreamComponent final
   static int GenerateUniqueId();
 
  public:
-  static MediaStreamComponent* Create(MediaStreamSource*);
-  static MediaStreamComponent* Create(const String& id, MediaStreamSource*);
-
+  MediaStreamComponent(MediaStreamSource*);
   MediaStreamComponent(const String& id, MediaStreamSource*);
 
   MediaStreamComponent* Clone() const;

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

@@ -32,6 +32,7 @@
 #include "third_party/blink/renderer/platform/mediastream/media_stream_descriptor.h"
 
 #include "third_party/blink/public/platform/web_media_stream.h"
+#include "third_party/blink/renderer/platform/heap/heap.h"
 #include "third_party/blink/renderer/platform/uuid.h"
 
 namespace blink {
@@ -47,28 +48,6 @@ int MediaStreamDescriptor::GenerateUniqueId() {
   return ++g_unique_media_stream_descriptor_id;
 }
 
-MediaStreamDescriptor* MediaStreamDescriptor::Create(
-    const MediaStreamSourceVector& audio_sources,
-    const MediaStreamSourceVector& video_sources) {
-  return MakeGarbageCollected<MediaStreamDescriptor>(
-      CreateCanonicalUUIDString(), audio_sources, video_sources);
-}
-
-MediaStreamDescriptor* MediaStreamDescriptor::Create(
-    const MediaStreamComponentVector& audio_components,
-    const MediaStreamComponentVector& video_components) {
-  return MakeGarbageCollected<MediaStreamDescriptor>(
-      CreateCanonicalUUIDString(), audio_components, video_components);
-}
-
-MediaStreamDescriptor* MediaStreamDescriptor::Create(
-    const String& id,
-    const MediaStreamComponentVector& audio_components,
-    const MediaStreamComponentVector& video_components) {
-  return MakeGarbageCollected<MediaStreamDescriptor>(id, audio_components,
-                                                     video_components);
-}
-
 void MediaStreamDescriptor::AddComponent(MediaStreamComponent* component) {
   switch (component->Source()->GetType()) {
     case MediaStreamSource::kTypeAudio:
@@ -144,19 +123,37 @@ void MediaStreamDescriptor::RemoveObserver(WebMediaStreamObserver* observer) {
   observers_.EraseAt(index);
 }
 
+MediaStreamDescriptor::MediaStreamDescriptor(
+    const MediaStreamSourceVector& audio_sources,
+    const MediaStreamSourceVector& video_sources)
+    : MediaStreamDescriptor(CreateCanonicalUUIDString(),
+                            audio_sources,
+                            video_sources) {}
+
 MediaStreamDescriptor::MediaStreamDescriptor(
     const String& id,
     const MediaStreamSourceVector& audio_sources,
     const MediaStreamSourceVector& video_sources)
     : client_(nullptr), id_(id), unique_id_(GenerateUniqueId()), active_(true) {
   DCHECK(id_.length());
-  for (MediaStreamSource* source : audio_sources)
-    audio_components_.push_back(MediaStreamComponent::Create(source));
+  for (MediaStreamSource* source : audio_sources) {
+    audio_components_.push_back(
+        MakeGarbageCollected<MediaStreamComponent>(source));
+  }
 
-  for (MediaStreamSource* source : video_sources)
-    video_components_.push_back(MediaStreamComponent::Create(source));
+  for (MediaStreamSource* source : video_sources) {
+    video_components_.push_back(
+        MakeGarbageCollected<MediaStreamComponent>(source));
+  }
 }
 
+MediaStreamDescriptor::MediaStreamDescriptor(
+    const MediaStreamComponentVector& audio_components,
+    const MediaStreamComponentVector& video_components)
+    : MediaStreamDescriptor(CreateCanonicalUUIDString(),
+                            audio_components,
+                            video_components) {}
+
 MediaStreamDescriptor::MediaStreamDescriptor(
     const String& id,
     const MediaStreamComponentVector& audio_components,

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

@@ -61,22 +61,13 @@ class PLATFORM_EXPORT MediaStreamDescriptor final
 
  public:
   // Only used for AudioDestinationNode.
-  static MediaStreamDescriptor* Create(
-      const MediaStreamSourceVector& audio_sources,
-      const MediaStreamSourceVector& video_sources);
-
-  static MediaStreamDescriptor* Create(
-      const MediaStreamComponentVector& audio_components,
-      const MediaStreamComponentVector& video_components);
-
-  static MediaStreamDescriptor* Create(
-      const String& id,
-      const MediaStreamComponentVector& audio_components,
-      const MediaStreamComponentVector& video_components);
-
+  MediaStreamDescriptor(const MediaStreamSourceVector& audio_sources,
+                        const MediaStreamSourceVector& video_sources);
   MediaStreamDescriptor(const String& id,
                         const MediaStreamSourceVector& audio_sources,
                         const MediaStreamSourceVector& video_sources);
+  MediaStreamDescriptor(const MediaStreamComponentVector& audio_components,
+                        const MediaStreamComponentVector& video_components);
   MediaStreamDescriptor(const String& id,
                         const MediaStreamComponentVector& audio_components,
                         const MediaStreamComponentVector& video_components);

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

@@ -35,16 +35,6 @@
 
 namespace blink {
 
-MediaStreamSource* MediaStreamSource::Create(const String& id,
-                                             StreamType type,
-                                             const String& name,
-                                             bool remote,
-                                             ReadyState ready_state,
-                                             bool requires_consumer) {
-  return MakeGarbageCollected<MediaStreamSource>(
-      id, type, name, remote, ready_state, requires_consumer);
-}
-
 MediaStreamSource::MediaStreamSource(const String& id,
                                      StreamType type,
                                      const String& name,

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

@@ -68,19 +68,12 @@ class PLATFORM_EXPORT MediaStreamSource final
 
   enum class EchoCancellationMode { kDisabled, kBrowser, kAec3, kSystem };
 
-  static MediaStreamSource* Create(const String& id,
-                                   StreamType,
-                                   const String& name,
-                                   bool remote,
-                                   ReadyState = kReadyStateLive,
-                                   bool requires_consumer = false);
-
   MediaStreamSource(const String& id,
                     StreamType,
                     const String& name,
                     bool remote,
-                    ReadyState,
-                    bool requires_consumer);
+                    ReadyState = kReadyStateLive,
+                    bool requires_consumer = false);
 
   const String& Id() const { return id_; }
   StreamType GetType() const { return type_; }