Remove old-style constraints from Chrome internals

content/renderer/media/rtc_peer_connection_handler.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
 #define CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 19 matching lines @@
 class WebRTCOfferOptions;
 class WebRTCPeerConnectionHandlerClient;
 }
 
 namespace content {
 
 class PeerConnectionDependencyFactory;
 class PeerConnectionTracker;
 class RemoteMediaStreamImpl;
 class RtcDataChannelHandler;
-class RTCMediaConstraints;
 class WebRtcMediaStreamAdapter;
 
 // Mockable wrapper for blink::WebRTCStatsResponse
 class CONTENT_EXPORT LocalRTCStatsResponse
     : public NON_EXPORTED_BASE(rtc::RefCountInterface) {
  public:
   explicit LocalRTCStatsResponse(const blink::WebRTCStatsResponse& impl)
       : impl_(impl) {
   }
 
@@ skipping 42 matching lines @@
     : NON_EXPORTED_BASE(public blink::WebRTCPeerConnectionHandler) {
  public:
   RTCPeerConnectionHandler(
       blink::WebRTCPeerConnectionHandlerClient* client,
       PeerConnectionDependencyFactory* dependency_factory);
   ~RTCPeerConnectionHandler() override;
 
   // Destroy all existing RTCPeerConnectionHandler objects.
   static void DestructAllHandlers();
 
-  static void ConvertOfferOptionsToConstraints(
-      const blink::WebRTCOfferOptions& options,
-      RTCMediaConstraints* output);
-
   void associateWithFrame(blink::WebFrame* frame);
 
   // Initialize method only used for unit test.
   bool InitializeForTest(
       const blink::WebRTCConfiguration& server_configuration,
       const blink::WebMediaConstraints& options,
       const base::WeakPtr<PeerConnectionTracker>& peer_connection_tracker);
 
   // blink::WebRTCPeerConnectionHandler implementation
   bool initialize(const blink::WebRTCConfiguration& server_configuration,
@@ skipping 10 matching lines @@
   void setLocalDescription(
       const blink::WebRTCVoidRequest& request,
       const blink::WebRTCSessionDescription& description) override;
   void setRemoteDescription(
       const blink::WebRTCVoidRequest& request,
       const blink::WebRTCSessionDescription& description) override;
 
   blink::WebRTCSessionDescription localDescription() override;
   blink::WebRTCSessionDescription remoteDescription() override;
 
-  bool updateICE(const blink::WebRTCConfiguration& server_configuration,
-                 const blink::WebMediaConstraints& options) override;
+  bool updateICE(
+      const blink::WebRTCConfiguration& server_configuration) override;
   bool addICECandidate(const blink::WebRTCICECandidate& candidate) override;
   bool addICECandidate(const blink::WebRTCVoidRequest& request,
                        const blink::WebRTCICECandidate& candidate) override;
   virtual void OnaddICECandidateResult(const blink::WebRTCVoidRequest& request,
                                        bool result);
 
   bool addStream(const blink::WebMediaStream& stream,
                  const blink::WebMediaConstraints& options) override;
   void removeStream(const blink::WebMediaStream& stream) override;
   void getStats(const blink::WebRTCStatsRequest& request) override;
@@ skipping 69 matching lines @@
   void ReportFirstSessionDescriptions(
       const FirstSessionDescription& local,
       const FirstSessionDescription& remote);
 
   // Virtual to allow mocks to override.
   virtual scoped_refptr<base::SingleThreadTaskRunner> signaling_thread() const;
 
   void RunSynchronousClosureOnSignalingThread(const base::Closure& closure,
                                               const char* trace_event_name);
 
+  // Not sure why these statics are class members at all.
+  static void ConvertOfferOptionsToWebrtcOfferOptions(
+      const blink::WebRTCOfferOptions& options,
+      webrtc::PeerConnectionInterface::RTCOfferAnswerOptions* output);
+
+  static void ConvertConstraintsToWebrtcOfferOptions(
+      const blink::WebMediaConstraints& options,
+      webrtc::PeerConnectionInterface::RTCOfferAnswerOptions* output);
+
   base::ThreadChecker thread_checker_;
 
   // |client_| is a weak pointer to the blink object (blink::RTCPeerConnection)
   // that owns this object.
   // It is valid for the lifetime of this object.
   blink::WebRTCPeerConnectionHandlerClient* const client_;
   // True if this PeerConnection has been closed.
   // After the PeerConnection has been closed, this object may no longer
   // forward callbacks to blink.
   bool is_closed_;
@@ skipping 41 matching lines @@
   bool ice_state_seen_[webrtc::PeerConnectionInterface::kIceConnectionMax] = {};
 
   base::WeakPtrFactory<RTCPeerConnectionHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RTCPeerConnectionHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_