media: Add Widevine CDM manifest.json in browser_tests.isolate

media: Add Widevine CDM manifest.json in browser_tests.isolate

This is required to run the browser_tests on swarming.

BUG=614745, 582622
TEST=This fixes failing browser_tests.

Committed: https://crrev.com/850d4ae72d7f0dcd54b6b699447412f5f99ec4b2
Cr-Commit-Position: refs/heads/master@{#397197}

[xhwang, 2016-06-01 16:48:37]

xhwang@chromium.org changed reviewers:
+ thakis@chromium.org

[xhwang, 2016-06-01 16:48:38]

PTAL

[Nico, 2016-06-01 16:49:45]

lgtm

Is this needed for gn too? gn doesn't use .isolate files but instead looks at gn
files (`gn help data_deps` etc)

[xhwang, 2016-06-01 16:58:05]

On 2016/06/01 16:49:45, Nico wrote:
> lgtm
> 
> Is this needed for gn too? gn doesn't use .isolate files but instead looks at
gn
> files (`gn help data_deps` etc)

Good question.

widevinecdmadapter is a data_deps for browser_tests:

https://code.google.com/p/chromium/codesearch#chromium/src/chrome/test/BUILD....

Then widevinecdmadapter will generate the adapter binary. It also depends on cdm
binary, and the manifest:

https://code.google.com/p/chromium/codesearch#chromium/src/third_party/widevi...

So I assume this is fine.

[Nico, 2016-06-01 17:01:15]

if you have a src-internal checkout, can you run ` gn desc out/gn
//chrome/test:browser_tests runtime_deps` and verify that the manifest is in
there?

[xhwang, 2016-06-01 17:16:26]

On 2016/06/01 17:01:15, Nico wrote:
> if you have a src-internal checkout, can you run ` gn desc out/gn
> //chrome/test:browser_tests runtime_deps` and verify that the manifest is in
> there?

gn desc out/GN //chrome/test:browser_tests runtime_deps | grep widevine
./libwidevinecdmadapter.so


gn desc out/GN //third_party/widevine/cdm:widevinecdmadapter deps
//media:cdm_api
//ppapi/cpp:cpp
//third_party/widevine/cdm:version_h
//third_party/widevine/cdm:widevine_cdm_manifest
//third_party/widevine/cdm:widevinecdm
//third_party/widevine/cdm:widevinecdmadapter_resources

Will this work? Or do I need to specify widevine_cdm_manifest and widevinecdm as
data_deps for browser_tests?

[Nico, 2016-06-01 17:27:10]

if the manifest isn't listed in the runtime_deps output, I believe it won't be
zipped up. You can use `mb run` as mentioned on the bug to run browser_tests
locally and see if they currently pass…

[Nico, 2016-06-01 17:27:34]

(but i'd be cool with landing this as-is to unbreak the gyp-using bots and then
investigate if gn works async)

[xhwang, 2016-06-01 17:32:26]

On 2016/06/01 17:27:34, Nico wrote:
> (but i'd be cool with landing this as-is to unbreak the gyp-using bots and
then
> investigate if gn works async)

[xhwang, 2016-06-01 17:33:13]

On 2016/06/01 17:32:26, xhwang wrote:
> On 2016/06/01 17:27:34, Nico wrote:
> > (but i'd be cool with landing this as-is to unbreak the gyp-using bots and
> then
> > investigate if gn works async)

Sure. Thanks for the help!

[xhwang, 2016-06-01 17:34:29]

The CQ bit was checked by xhwang@chromium.org

[commit-bot: I haz the power, 2016-06-01 17:35:26]

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

[xhwang, 2016-06-01 18:53:20]

On 2016/06/01 17:27:10, Nico wrote:
> if the manifest isn't listed in the runtime_deps output, I believe it won't be
> zipped up. You can use `mb run` as mentioned on the bug to run browser_tests
> locally and see if they currently pass…

You are right. In the generated isolate file I only see
libwidevinecdmadapter.so.

Actually "gn help runtime_deps" is a good read on this topic.

I'll fix the gn issue in another CL shortly (hopefully).

[commit-bot: I haz the power, 2016-06-01 18:57:49]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-06-01 19:11:47]

Description was changed from

==========
media: Add Widevine CDM manifest.json in browser_tests.isolate

This is required to run the browser_tests on swarming.

BUG=614745,582622
TEST=This fixes failing browser_tests.
==========

to

==========
media: Add Widevine CDM manifest.json in browser_tests.isolate

This is required to run the browser_tests on swarming.

BUG=614745,582622
TEST=This fixes failing browser_tests.

Committed: https://crrev.com/850d4ae72d7f0dcd54b6b699447412f5f99ec4b2
Cr-Commit-Position: refs/heads/master@{#397197}
==========

[commit-bot: I haz the power, 2016-06-01 19:11:48]

Patchset 1 (id:??) landed as
https://crrev.com/850d4ae72d7f0dcd54b6b699447412f5f99ec4b2
Cr-Commit-Position: refs/heads/master@{#397197}