Encrypted Media: Confine UUID code to MediaDrmBridge.

media/media.gyp

Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index f448ff0e67bacb2c9792a389cea21246a3fe95c6..4d29d0bea7763c8abd49c3c91d8b7dddc512f9d4 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -913,6 +913,7 @@
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',

[xhwang, 2014/03/04 00:18:58]

This is for kWidevineKeySystem, which is ugly... How about putting
kWidevineKeySystem in a common place in Chromium code base? e.g.
media/cdm/key_system_names.h

[ddorwin, 2014/03/04 20:00:56]

Let's discuss. For one thing, including this file helps identify places where
key system-specific code exists.

         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/ui.gyp:ui',
@@ -1046,6 +1047,10 @@
         'formats/webm/webm_tracks_parser_unittest.cc',
         'formats/webm/webm_webvtt_parser_unittest.cc',
       ],
+      'include_dirs': [
+        # Needed by media_drm_bridge.cc.
+        '<(SHARED_INTERMEDIATE_DIR)',

[ddorwin, 2014/03/04 20:00:56]

I believe this can be addressed by adding a dependent_settings item to
widevine_cdm.gyp:widevine_cdm_version_h. We just never got around to it. It
would clean up several other .gyp files too.

[xhwang, 2014/03/05 21:52:33]

Since we have a lot of places like this. I'll investigate this in a separate CL.

+      ],
       'conditions': [
         ['arm_neon==1', {
           'defines': [
@@ -1575,10 +1580,15 @@
           ],
           'dependencies': [
             '../base/base.gyp:base',
+            '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',

[xhwang, 2014/03/04 00:18:58]

ditto

             '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
             'media_android_jni_headers',
           ],
+          'include_dirs': [
+            # Needed by media_drm_bridge.cc.
+            '<(SHARED_INTERMEDIATE_DIR)',
+          ],
           'defines': [
             'MEDIA_IMPLEMENTATION',
           ],