Fix OnClose(socket, NO_ERROR) compile error on Linux.
Merge Peerconnection_client_dev with Peerconnection_client.

BUG=
TEST=

Review URL: http://webrtc-codereview.appspot.com/215002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@720 4adac7df-926f-26a2-2b94-8c16560cd09d
3 files changed