Small cleaups to media to support disabling ozone and libvpx properly.

Small cleaups to media to support disabling ozone and libvpx properly.

Also combined two identiciation conditional blobs for android into one.
With this patch:
  - ozone files no longer built if use_ozone is 0.
  - media_unittests builds even if media_use_libvpx is 0.

Also removes an unnecessary test_support_perf dependency. Not sure how that ever built since having it means there are 2 main functions (one in test_support_perf and the other in ffmpeg_unittests.cc.

BUG=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=281947

[scherkus (not reviewing), 2014-07-08 21:10:03]

two q's

https://codereview.chromium.org/377993003/diff/1/media/filters/pipeline_integ...
File media/filters/pipeline_integration_test_base.cc (right):

https://codereview.chromium.org/377993003/diff/1/media/filters/pipeline_integ...
media/filters/pipeline_integration_test_base.cc:252: #endif  //
!defined(MEDIA_DISABLE_LIBVPX)
is this only to fix compile-time issues?

note that this will result in failing libvpx-related tests (e.g., VP9, VP8A)
inside pipeline_integration_test.cc ... but I don't think that's too big of a
deal

https://codereview.chromium.org/377993003/diff/1/media/media.gyp
File media/media.gyp (left):

https://codereview.chromium.org/377993003/diff/1/media/media.gyp#oldcode1715
media/media.gyp:1715: '../base/base.gyp:test_support_perf',
didn't see this mentioned in the CL description -- accidental or intentional?

[awong, 2014-07-08 21:28:03]

https://codereview.chromium.org/377993003/diff/1/media/filters/pipeline_integ...
File media/filters/pipeline_integration_test_base.cc (right):

https://codereview.chromium.org/377993003/diff/1/media/filters/pipeline_integ...
media/filters/pipeline_integration_test_base.cc:252: #endif  //
!defined(MEDIA_DISABLE_LIBVPX)
On 2014/07/08 21:10:02, scherkus wrote:
> is this only to fix compile-time issues?
> 
> note that this will result in failing libvpx-related tests (e.g., VP9, VP8A)
> inside pipeline_integration_test.cc ... but I don't think that's too big of a
> deal

Yep. Only a compile-time fix. Should I also wrap the libvpx tests to disable
them

https://codereview.chromium.org/377993003/diff/1/media/media.gyp
File media/media.gyp (left):

https://codereview.chromium.org/377993003/diff/1/media/media.gyp#oldcode1715
media/media.gyp:1715: '../base/base.gyp:test_support_perf',
On 2014/07/08 21:10:03, scherkus wrote:
> didn't see this mentioned in the CL description -- accidental or intentional?

intentional. Updated CL description.

I don't know why this is working in gyp, but including both  test_support_perf
and ffmpeg_unittests.cc ends up with 2 mains.

[scherkus (not reviewing), 2014-07-08 21:30:01]

lgtm

https://codereview.chromium.org/377993003/diff/1/media/filters/pipeline_integ...
File media/filters/pipeline_integration_test_base.cc (right):

https://codereview.chromium.org/377993003/diff/1/media/filters/pipeline_integ...
media/filters/pipeline_integration_test_base.cc:252: #endif  //
!defined(MEDIA_DISABLE_LIBVPX)
On 2014/07/08 21:28:03, awong wrote:
> On 2014/07/08 21:10:02, scherkus wrote:
> > is this only to fix compile-time issues?
> > 
> > note that this will result in failing libvpx-related tests (e.g., VP9, VP8A)
> > inside pipeline_integration_test.cc ... but I don't think that's too big of
a
> > deal
> 
> Yep. Only a compile-time fix. Should I also wrap the libvpx tests to disable
> them

I'm OK leaving them as-is.

[awong, 2014-07-08 22:25:31]

The CQ bit was checked by ajwong@chromium.org

[commit-bot: I haz the power, 2014-07-08 22:27:11]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/ajwong@chromium.org/377993003/1

[commit-bot: I haz the power, 2014-07-09 05:14:02]

Change committed as 281947