Add media_features deps in media.gyp and media/base/BUILD.gn

media/media.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 1084 matching lines @@
         }],
       ],  # target_conditions
     },
     {
       # GN version: //media:media_unittests
       'target_name': 'media_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         'audio_test_config',
         'media',
+        'media_features',

[wolenetz, 2016/04/21 23:29:15]

Is this explicitly necessary, since media_test_support contains it now in this
CL, too?

[servolk, 2016/04/22 18:46:24]

I assumed that it wasn't necessary, since I thought the dependencies were
transitive (and media already depends on media_features), but somehow without
this explicit dependency the Win build on trunk was broken. With this explicit
dependency the build is green an all platforms. So let's keep it for now, there
should be no harm in it (since, as I've said media already depends on
media_features anyway, and all the targets changed here already have a
dependency on media target). Hopefully GYP days are counted and we'll all just
switch to GN soon.

         'media_test_support',
         'shared_memory_support',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../gpu/gpu.gyp:command_buffer_common',
         '../gpu/gpu.gyp:gpu_unittest_utils',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ skipping 256 matching lines @@
       'dependencies': [
         '../base/base.gyp:test_support_base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../testing/perf/perf_test.gyp:perf_test',
         '../third_party/libyuv/libyuv.gyp:libyuv',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gfx/gfx.gyp:gfx_test_support',
         'media',
+        'media_features',

[wolenetz, 2016/04/21 23:29:15]

ditto

[servolk, 2016/04/22 18:46:24]

Acknowledged.

         'media_test_support',
         'shared_memory_support',
       ],
       'sources': [
         'base/audio_bus_perftest.cc',
         'base/audio_converter_perftest.cc',
         'base/demuxer_perftest.cc',
         'base/run_all_perftests.cc',
         'base/sinc_resampler_perftest.cc',
         'base/vector_math_perftest.cc',
@@ skipping 133 matching lines @@
         'base/run_all_unittests.cc',
       ],
     },
     {
       # GN versions (it is split apart): //media:test_support,
       # //media/base:test_support, and //media/audio:test_support
       'target_name': 'media_test_support',
       'type': 'static_library',
       'dependencies': [
         'media',
+        'media_features',
         'shared_memory_support',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         'audio/audio_unittest_util.cc',
         'audio/audio_unittest_util.h',
         'audio/mock_audio_manager.cc',
@@ skipping 528 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }