Merge webrtc/video_engine/ into webrtc/video/

Merge webrtc/video_engine/ into webrtc/video/

BUG=webrtc:1695
R=mflodman@webrtc.org

Committed: https://crrev.com/03ef053202bc5d5ab43460eebf5403232f157646
Cr-Commit-Position: refs/heads/master@{#10926}

[pbos-webrtc, 2015-12-07 08:52:51]

PTAL

[pbos-webrtc, 2015-12-07 08:52:58]

The CQ bit was checked by pbos@webrtc.org to run a CQ dry run

[commit-bot: I haz the power, 2015-12-07 08:53:01]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1506773002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1506773002/1

[pbos-webrtc, 2015-12-07 08:56:38]

Output of git diff --find-copies-harder master:
https://pastebin.mozilla.org/8854008

Probably way easier to review.

[commit-bot: I haz the power, 2015-12-07 09:21:05]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-07 09:21:06]

Dry run: Try jobs failed on following builders:
  presubmit on tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/2227)

[pbos-webrtc, 2015-12-07 09:24:31]

On 2015/12/07 09:21:06, commit-bot: I haz the power wrote:
> Dry run: Try jobs failed on following builders:
>   presubmit on tryserver.webrtc (JOB_FAILED,
> http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/2227)

Failed due to changes in:
  webrtc/transport.h \
  webrtc/video_renderer.h

Of which I only change the #ifndef defines. Still ready to be
reviewed/submitted. :)

[mflodman, 2015-12-08 08:01:14]

video(_engine) is dead, long live video!

LGTM

[pbos-webrtc, 2015-12-08 08:06:24]

rebase

[pbos-webrtc, 2015-12-08 08:09:12]

Description was changed from

==========
Merge webrtc/video_engine/ into webrtc/video/

BUG=webrtc:1695
R=mflodman@webrtc.org
==========

to

==========
Merge webrtc/video_engine/ into webrtc/video/

BUG=webrtc:1695
R=mflodman@webrtc.org

Committed:
https://chromium.googlesource.com/external/webrtc/+/03ef053202bc5d5ab43460eeb...
==========

[pbos-webrtc, 2015-12-08 08:09:13]

Committed patchset #2 (id:20001) manually as
03ef053202bc5d5ab43460eebf5403232f157646 (presubmit successful).

[commit-bot: I haz the power, 2015-12-08 08:09:13]

Description was changed from

==========
Merge webrtc/video_engine/ into webrtc/video/

BUG=webrtc:1695
R=mflodman@webrtc.org

Committed:
https://chromium.googlesource.com/external/webrtc/+/03ef053202bc5d5ab43460eeb...
==========

to

==========
Merge webrtc/video_engine/ into webrtc/video/

BUG=webrtc:1695
R=mflodman@webrtc.org

Committed: https://crrev.com/03ef053202bc5d5ab43460eebf5403232f157646
Cr-Commit-Position: refs/heads/master@{#10926}
==========

[commit-bot: I haz the power, 2015-12-08 08:09:14]

Patchset 2 (id:??) landed as
https://crrev.com/03ef053202bc5d5ab43460eebf5403232f157646
Cr-Commit-Position: refs/heads/master@{#10926}

[kjellander_webrtc, 2015-12-08 15:01:39]

A revert of this CL (patchset #2 id:20001) has been created in
https://codereview.webrtc.org/1507903005/ by kjellander@webrtc.org.

The reason for reverting is: Breaks Dr Memory Light
https://build.chromium.org/p/client.webrtc/builders/Win%20DrMemory%20Light/bu...
and all the Android Tests bots..