tree 74f752b1e9a7a7bb14713ae08f4f0399a3a3deb5
parent 319fbd107d03e9f4f99aa9de8a67d04077deaad4
author wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> 1313108424 +0000
committer wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> 1313108424 +0000

Two changes:
1) Libjingle and webrtc use different jsoncpp, so we need to distinguish them.
2) Update the webrtcsession_unittest:
 * Use the Thread::SleepMs
 * Remove main, which has been defined in talk/base/unittest_main.
Review URL: http://webrtc-codereview.appspot.com/107003

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