GitLab

Also includes type mapping for media::EncryptionScheme.

Bug: 611224
Change-Id: I151aacd4ea2dfe9e02ff7c82c922bc5a982e1fd4
Reviewed-on: https://chromium-review.googlesource.com/544913Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Dan Sanders <sandersd@chromium.org>
Commit-Queue: Chrome Cunningham <chcunningham@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485133}