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

Review URL: https://codereview.chromium.org/377993003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281947 0039d316-1c4b-4281-b951-d872f2087c98

media/filters/pipeline_integration_test_base.cc

@@ -246,8 +246,10 @@ PipelineIntegrationTestBase::CreateFilterCollection(
   collection->SetDemuxer(demuxer_.get());
 
   ScopedVector<VideoDecoder> video_decoders;
+#if !defined(MEDIA_DISABLE_LIBVPX)
   video_decoders.push_back(
       new VpxVideoDecoder(message_loop_.message_loop_proxy()));
+#endif  // !defined(MEDIA_DISABLE_LIBVPX)
   video_decoders.push_back(
       new FFmpegVideoDecoder(message_loop_.message_loop_proxy()));
 

media/media.gyp

@@ -774,6 +774,11 @@
               ],
             },
           ]
+        }, {
+          'sources!': [
+            'ozone/media_ozone_platform.cc',
+            'ozone/media_ozone_platform.h',
+          ]
         }],
         ['OS!="linux"', {
           'sources!': [
@@ -1595,10 +1600,6 @@
           },
           'includes': ['../build/apk_test.gypi'],
         },
-      ],
-    }],
-    ['OS=="android"', {
-      'targets': [
         {
           'target_name': 'media_android_jni_headers',
           'type': 'none',
@@ -1712,7 +1713,6 @@
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
             '../base/base.gyp:test_support_base',
-            '../base/base.gyp:test_support_perf',
             '../testing/gtest.gyp:gtest',
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
             'media',