Revert 8237 "Cleanup and prepare for bundling."
libjingle_peerconnection_objc_test consistently failing on Mac64 Debug.
> Cleanup and prepare for bundling.
>
> - Add a GetOptions function. Needed for eventual bundle testing to
> confirm that channel options are preserved.
> - Simplify unit tests and cleanup unused code.
>
> BUG=1574
> R=pthatcher@webrtc.org, tommi@webrtc.org
>
> Review URL: https://webrtc-codereview.appspot.com/39699004
TBR=pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/34959004
Cr-Commit-Position: refs/heads/master@{#8241}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8241 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/app/webrtc/peerconnectioninterface.h b/talk/app/webrtc/peerconnectioninterface.h
index 1b52a56..35ba705 100644
--- a/talk/app/webrtc/peerconnectioninterface.h
+++ b/talk/app/webrtc/peerconnectioninterface.h
@@ -506,13 +506,13 @@
// http://dev.w3.org/2011/webrtc/editor/webrtc.html
inline rtc::scoped_refptr<PeerConnectionInterface>
CreatePeerConnection(
- const PeerConnectionInterface::IceServers& servers,
+ const PeerConnectionInterface::IceServers& configuration,
const MediaConstraintsInterface* constraints,
PortAllocatorFactoryInterface* allocator_factory,
DTLSIdentityServiceInterface* dtls_identity_service,
PeerConnectionObserver* observer) {
PeerConnectionInterface::RTCConfiguration rtc_config;
- rtc_config.servers = servers;
+ rtc_config.servers = configuration;
return CreatePeerConnection(rtc_config, constraints, allocator_factory,
dtls_identity_service, observer);
}