Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Unified Diff: third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp

Issue 1417023003: Disable test and remove the reference of enable_localhost_ice_candidate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test cases with certificates Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp
diff --git a/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp b/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp
index 2325c73dcbc9e7767b4781dee5d0769fad4b5e7e..e02a3159c5e061dc4432a1a428af5b5f1f11a2a3 100644
--- a/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp
+++ b/third_party/WebKit/Source/platform/exported/WebRTCConfiguration.cpp
@@ -71,48 +71,33 @@ WebString WebRTCICEServer::credential() const
return m_private->credential();
}
-WebRTCICEServerArray::WebRTCICEServerArray(RTCIceServerArray* iceServers)
- : m_private(iceServers)
+WebRTCConfiguration::WebRTCConfiguration(RTCConfiguration* configuration)
+ : m_private(configuration)
{
}
-void WebRTCICEServerArray::assign(const WebRTCICEServerArray& other)
+void WebRTCConfiguration::assign(const WebRTCConfiguration& other)
{
m_private = other.m_private;
}
-void WebRTCICEServerArray::reset()
+void WebRTCConfiguration::reset()
{
m_private.reset();
}
-size_t WebRTCICEServerArray::numberOfServers() const
+size_t WebRTCConfiguration::numberOfServers() const
{
ASSERT(!isNull());
return m_private->numberOfServers();
}
-WebRTCICEServer WebRTCICEServerArray::server(size_t index) const
+WebRTCICEServer WebRTCConfiguration::server(size_t index) const
{
ASSERT(!isNull());
return WebRTCICEServer(m_private->server(index));
}
-WebRTCConfiguration::WebRTCConfiguration(RTCConfiguration* configuration)
- : m_private(configuration)
-{
-}
-
-void WebRTCConfiguration::assign(const WebRTCConfiguration& other)
-{
- m_private = other.m_private;
-}
-
-void WebRTCConfiguration::reset()
-{
- m_private.reset();
-}
-
WebRTCIceTransports WebRTCConfiguration::iceTransports() const
{
ASSERT(!isNull());
@@ -159,12 +144,6 @@ WebRTCRtcpMuxPolicy WebRTCConfiguration::rtcpMuxPolicy() const
return WebRTCRtcpMuxPolicyNegotiate;
}
-WebRTCICEServerArray WebRTCConfiguration::iceServers() const
-{
- ASSERT(!isNull());
- return WebRTCICEServerArray(m_private->iceServers());
-}
-
size_t WebRTCConfiguration::numberOfCertificates() const
{
ASSERT(!isNull());

Powered by Google App Engine
This is Rietveld 408576698