commit 9e65a3b0135467d0508875d675f0551e9c7fe82a
author pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Jun 11 13:42:37 2014 +0000
committer pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Jun 11 13:42:37 2014 +0000
tree b5a56d3b47729c7fcfe7a1e62779b384e1f9c138
parent fbb567dacd76298c5721eae8d0d2cb46fffc9d31

Re-land webrtcmediaengine.cc part of r6397.

webrtcvideoengine.cc un-reverted by a bot roll in r6399 so half of r6397
is still applied. The applied fix (diff between r6397) is to put
WebRtcVideoEngine2 in ifdefs and only build for WEBRTC_CHROMIUM_BUILDs
corresponding to webrtcmediaengine.h.

BUG=
R=minyue@webrtc.org
TBR=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/19719005

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