Remove old-style constraints from Chrome internals

content/renderer/media/webrtc/media_stream_video_webrtc_sink.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webrtc/media_stream_video_webrtc_sink.h"
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/common/media/media_stream_options.h"
+#include "content/renderer/media/media_stream_constraints_util.h"
 #include "content/renderer/media/media_stream_video_track.h"
 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
 
-namespace {
-
-bool ConstraintKeyExists(const blink::WebMediaConstraints& constraints,
-                         const blink::WebString& name) {
-  blink::WebString value_str;
-  return constraints.getMandatoryConstraintValue(name, value_str) ||
-      constraints.getOptionalConstraintValue(name, value_str);
-}
-
-}  // anonymouse namespace
-
 namespace content {
 
 // Simple help class used for receiving video frames on the IO-thread from a
 // MediaStreamVideoTrack and forward the frames to a WebRtcVideoCapturerAdapter
 // on libjingle's worker thread. WebRtcVideoCapturerAdapter implements a video
 // capturer for libjingle.
 class MediaStreamVideoWebRtcSink::WebRtcVideoSourceAdapter
     : public base::RefCountedThreadSafe<WebRtcVideoSourceAdapter> {
  public:
   WebRtcVideoSourceAdapter(
@@ skipping 94 matching lines @@
     capture_adapter_->OnFrameCaptured(frame);
 }
 
 MediaStreamVideoWebRtcSink::MediaStreamVideoWebRtcSink(
     const blink::WebMediaStreamTrack& track,
     PeerConnectionDependencyFactory* factory)
     : web_track_(track) {
   const blink::WebMediaConstraints& constraints =
       MediaStreamVideoTrack::GetVideoTrack(track)->constraints();
 
-  bool is_screencast = ConstraintKeyExists(
-      constraints, base::UTF8ToUTF16(kMediaStreamSource));
+  std::string value;
+  bool is_screencast = GetConstraintValueAsString(
+      constraints, &blink::WebMediaTrackConstraintSet::mediaStreamSource,
+      &value);

[tommi (sloooow) - chröme, 2016/03/14 18:37:47]

add a comment that explains why we don't use |value|?

[hta - Chromium, 2016/03/15 06:47:33]

Done.

   WebRtcVideoCapturerAdapter* capture_adapter =
       factory->CreateVideoCapturer(is_screencast);
 
   // |video_source| owns |capture_adapter|
   scoped_refptr<webrtc::VideoTrackSourceInterface> video_source(
-      factory->CreateVideoSource(capture_adapter,
-                                 track.source().constraints()));
+      factory->CreateVideoSource(capture_adapter));
 
   video_track_ = factory->CreateLocalVideoTrack(web_track_.id().utf8(),
                                                 video_source.get());
 
   video_track_->set_enabled(web_track_.isEnabled());
 
   source_adapter_ = new WebRtcVideoSourceAdapter(
       factory->GetWebRtcWorkerThread(),
       video_source,
       capture_adapter);
@@ skipping 13 matching lines @@
   RemoveFromVideoTrack(this, web_track_);
   source_adapter_->ReleaseSourceOnMainThread();
 }
 
 void MediaStreamVideoWebRtcSink::OnEnabledChanged(bool enabled) {
   DCHECK(thread_checker_.CalledOnValidThread());
   video_track_->set_enabled(enabled);
 }
 
 }  // namespace content