| Index: third_party/WebKit/public/platform/WebRTCConfiguration.h
|
| diff --git a/third_party/WebKit/public/platform/WebRTCConfiguration.h b/third_party/WebKit/public/platform/WebRTCConfiguration.h
|
| index d17ecbe6e82eeca13ef6fccad0cb72acd3f332b6..5849ea1e501407cd73906835863e3dc20ab5671c 100644
|
| --- a/third_party/WebKit/public/platform/WebRTCConfiguration.h
|
| +++ b/third_party/WebKit/public/platform/WebRTCConfiguration.h
|
| @@ -39,7 +39,6 @@
|
| namespace blink {
|
|
|
| class RTCIceServer;
|
| -class RTCIceServerArray;
|
| class RTCConfiguration;
|
| class WebRTCCertificate;
|
| class WebString;
|
| @@ -74,33 +73,6 @@ private:
|
| WebPrivatePtr<RTCIceServer> m_private;
|
| };
|
|
|
| -class WebRTCICEServerArray {
|
| -public:
|
| - WebRTCICEServerArray() {}
|
| - WebRTCICEServerArray(const WebRTCICEServerArray& other) { assign(other); }
|
| - ~WebRTCICEServerArray() { reset(); }
|
| - WebRTCICEServerArray& operator=(const WebRTCICEServerArray& other)
|
| - {
|
| - assign(other);
|
| - return *this;
|
| - }
|
| -
|
| - BLINK_PLATFORM_EXPORT void assign(const WebRTCICEServerArray&);
|
| -
|
| - BLINK_PLATFORM_EXPORT void reset();
|
| - bool isNull() const { return m_private.isNull(); }
|
| -
|
| - BLINK_PLATFORM_EXPORT size_t numberOfServers() const;
|
| - BLINK_PLATFORM_EXPORT WebRTCICEServer server(size_t index) const;
|
| -
|
| -#if INSIDE_BLINK
|
| - BLINK_PLATFORM_EXPORT WebRTCICEServerArray(RTCIceServerArray*);
|
| -#endif
|
| -
|
| -private:
|
| - WebPrivatePtr<RTCIceServerArray> m_private;
|
| -};
|
| -
|
| enum WebRTCIceTransports {
|
| WebRTCIceTransportsNone,
|
| WebRTCIceTransportsRelay,
|
| @@ -140,7 +112,8 @@ public:
|
| BLINK_PLATFORM_EXPORT WebRTCBundlePolicy bundlePolicy() const;
|
|
|
| BLINK_PLATFORM_EXPORT WebRTCRtcpMuxPolicy rtcpMuxPolicy() const;
|
| - BLINK_PLATFORM_EXPORT WebRTCICEServerArray iceServers() const;
|
| + BLINK_PLATFORM_EXPORT size_t numberOfServers() const;
|
| + BLINK_PLATFORM_EXPORT WebRTCICEServer server(size_t index) const;
|
|
|
| BLINK_PLATFORM_EXPORT size_t numberOfCertificates() const;
|
| BLINK_PLATFORM_EXPORT WebRTCCertificate* certificate(size_t index) const;
|
|
|