Merge RTCConfiguration into WebRTCConfiguration

third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 31 matching lines @@
 #include "platform/AsyncMethodRunner.h"
 #include "public/platform/WebMediaConstraints.h"
 #include "public/platform/WebRTCPeerConnectionHandler.h"
 #include "public/platform/WebRTCPeerConnectionHandlerClient.h"
 #include <memory>
 
 namespace blink {
 class ExceptionState;
 class MediaStreamTrack;
 class RTCAnswerOptions;
-class RTCConfiguration;
 class RTCDTMFSender;
 class RTCDataChannel;
 class RTCIceCandidateInitOrRTCIceCandidate;
 class RTCOfferOptions;
 class RTCPeerConnectionErrorCallback;
 class RTCSessionDescription;
 class RTCSessionDescriptionCallback;
 class RTCSessionDescriptionInit;
 class RTCStatsCallback;
 class ScriptState;
 class VoidCallback;
+struct WebRTCConfiguration;
 
 class RTCPeerConnection final : public EventTargetWithInlineData,
                                 public WebRTCPeerConnectionHandlerClient,
                                 public ActiveScriptWrappable,
                                 public ActiveDOMObject {
   DEFINE_WRAPPERTYPEINFO();
   USING_GARBAGE_COLLECTED_MIXIN(RTCPeerConnection);
   USING_PRE_FINALIZER(RTCPeerConnection, dispose);
 
  public:
@@ skipping 132 matching lines @@
 
     DECLARE_TRACE();
 
     Member<Event> m_event;
 
    private:
     std::unique_ptr<BoolFunction> m_setupFunction;
   };
 
   RTCPeerConnection(ExecutionContext*,
-                    RTCConfiguration*,
+                    const WebRTCConfiguration&,
                     WebMediaConstraints,
                     ExceptionState&);
   void dispose();
 
   void scheduleDispatchEvent(Event*);
   void scheduleDispatchEvent(Event*, std::unique_ptr<BoolFunction>);
   void dispatchScheduledEvent();
   bool hasLocalStreamWithTrackId(const String& trackId);
 
   void changeSignalingState(WebRTCPeerConnectionHandlerClient::SignalingState);
@@ skipping 26 matching lines @@
 
   bool m_stopped;
   bool m_closed;
 
   bool m_hasDataChannels;  // For RAPPOR metrics
 };
 
 }  // namespace blink
 
 #endif  // RTCPeerConnection_h