Make ffmpeg specific unit_tests depend on media_use_ffmpeg

Make ffmpeg specific unit_tests depend on media_use_ffmpeg

Media unit tests depending on ffmpeg are currently only removed
using OS=="android", but let's remove them based on
media_use_ffmpeg==0 instead.

BUG=410779
R=acolwell@chromium.org

Committed: https://crrev.com/08a76ea64572fccb87596ae31352861b5e2e71a1
Cr-Commit-Position: refs/heads/master@{#294148}

[Henrik Steen, 2014-09-04 11:58:01]

Just some small code cleanup to make it possible to build non-Android targets
not using ffmpeg.

[acolwell GONE FROM CHROMIUM, 2014-09-04 17:01:15]

Please update BUILD.gn with similar changes.

[acolwell GONE FROM CHROMIUM, 2014-09-06 00:04:10]

lgtm

[Henrik Steen, 2014-09-09 05:28:06]

The CQ bit was checked by henriks@opera.com

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

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/henriks@opera.com/541553003/20001

[commit-bot: I haz the power, 2014-09-09 09:09:46]

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

[commit-bot: I haz the power, 2014-09-09 09:09:47]

Failed to apply patch for media/BUILD.gn:
While running git apply --index -p1;
  error: patch failed: media/BUILD.gn:478
  error: media/BUILD.gn: patch does not apply

Patch:       media/BUILD.gn
Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index
1c3ee413a66dfa50e916dad67f675bdcb92fd701..a55e11a695395ebafeb87ff10645a87826326b50
100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -478,7 +478,7 @@ test("media_unittests") {
     "formats/webm/webm_webvtt_parser_unittest.cc",
   ]
 
-  if (!is_android) {
+  if (media_use_ffmpeg) {
     sources += [
       "ffmpeg/ffmpeg_common_unittest.cc",
       "filters/audio_decoder_unittest.cc",
@@ -491,7 +491,9 @@ test("media_unittests") {
       "filters/pipeline_integration_test.cc",
       "filters/pipeline_integration_test_base.cc",
     ]
-  } else {
+  }
+
+  if (is_android) {
 # TODO(ajwong): Blocked on android.
 #    deps += [
 #      ":player_android",

[Henrik Steen, 2014-09-10 07:17:47]

The CQ bit was checked by henriks@opera.com

[commit-bot: I haz the power, 2014-09-10 07:18:41]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/henriks@opera.com/541553003/40001

[commit-bot: I haz the power, 2014-09-10 09:20:02]

Committed patchset #3 (id:40001) as e2e80d330c13fab3224cbe3f7b0d4cda9df5cd0f

[commit-bot: I haz the power, 2014-09-10 10:56:14]

Patchset 3 (id:??) landed as
https://crrev.com/08a76ea64572fccb87596ae31352861b5e2e71a1
Cr-Commit-Position: refs/heads/master@{#294148}