Relocate last remnants of webkit/renderer/media code.

media/media_cdm.gypi

 # Copyright 2013 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': {
     'conditions': [
       ['OS == "android" or OS == "ios"', {
         # Android and iOS don't use ffmpeg.
         'use_ffmpeg%': 0,
@@ skipping 11 matching lines @@
     {
       'target_name': 'clearkeycdm',
       'type': 'none',
       # TODO(tomfinegan): Simplify this by unconditionally including all the
       # decoders, and changing clearkeycdm to select which decoder to use
       # based on environment variables.
       'conditions': [
         ['use_fake_video_decoder == 1' , {
           'defines': ['CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER'],
           'sources': [
-            'crypto/ppapi/fake_cdm_video_decoder.cc',
-            'crypto/ppapi/fake_cdm_video_decoder.h',
+            'cdm/ppapi/fake_cdm_video_decoder.cc',
+            'cdm/ppapi/fake_cdm_video_decoder.h',
           ],
         }],
         ['use_ffmpeg == 1'  , {
           'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'],
           'dependencies': [
             '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
           'sources': [
-            'crypto/ppapi/ffmpeg_cdm_audio_decoder.cc',
-            'crypto/ppapi/ffmpeg_cdm_audio_decoder.h',
+            'cdm/ppapi/ffmpeg_cdm_audio_decoder.cc',
+            'cdm/ppapi/ffmpeg_cdm_audio_decoder.h',
           ],
         }],
         ['use_ffmpeg == 1 and use_fake_video_decoder == 0'  , {
           'sources': [
-            'crypto/ppapi/ffmpeg_cdm_video_decoder.cc',
-            'crypto/ppapi/ffmpeg_cdm_video_decoder.h',
+            'cdm/ppapi/ffmpeg_cdm_video_decoder.cc',
+            'cdm/ppapi/ffmpeg_cdm_video_decoder.h',
           ],
         }],
         ['use_libvpx == 1 and use_fake_video_decoder == 0' , {
           'defines': ['CLEAR_KEY_CDM_USE_LIBVPX_DECODER'],
           'dependencies': [
             '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
           ],
           'sources': [
-            'crypto/ppapi/libvpx_cdm_video_decoder.cc',
-            'crypto/ppapi/libvpx_cdm_video_decoder.h',
+            'cdm/ppapi/libvpx_cdm_video_decoder.cc',
+            'cdm/ppapi/libvpx_cdm_video_decoder.h',
           ],
         }],
         ['os_posix == 1 and OS != "mac" and enable_pepper_cdms==1', {
           'type': 'loadable_module',  # Must be in PRODUCT_DIR for ASAN bots.
         }],
         ['(OS == "mac" or OS == "win") and enable_pepper_cdms==1', {
           'type': 'shared_library',
         }],
         ['OS == "mac"', {
           'xcode_settings': {
             'DYLIB_INSTALL_NAME_BASE': '@loader_path',
           },
         }]
       ],
       'defines': ['CDM_IMPLEMENTATION'],
       'dependencies': [
+        'media',
+        # Include the following for media::AudioBus.
+        'shared_memory_support',
         '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/media/media.gyp:media',
-        # Include the following for media::AudioBus.
-        '<(DEPTH)/media/media.gyp:shared_memory_support',
       ],
       'sources': [
-        'crypto/ppapi/cdm_video_decoder.cc',
-        'crypto/ppapi/cdm_video_decoder.h',
-        'crypto/ppapi/clear_key_cdm.cc',
-        'crypto/ppapi/clear_key_cdm.h',
+        'cdm/ppapi/cdm_video_decoder.cc',
+        'cdm/ppapi/cdm_video_decoder.h',
+        'cdm/ppapi/clear_key_cdm.cc',
+        'cdm/ppapi/clear_key_cdm.h',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
     {
       'target_name': 'clearkeycdmadapter',
       'type': 'none',
       # Check whether the plugin's origin URL is valid.
       'defines': ['CHECK_DOCUMENT_URL'],
       'dependencies': [
         '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
         'clearkeycdm',
       ],
       'sources': [
-        'crypto/ppapi/cdm_wrapper.cc',
-        'crypto/ppapi/cdm/content_decryption_module.h',
-        'crypto/ppapi/linked_ptr.h',
+        'cdm/ppapi/api/content_decryption_module.h',
+        'cdm/ppapi/cdm_wrapper.cc',
+        'cdm/ppapi/linked_ptr.h',
       ],
       'conditions': [
         ['os_posix == 1 and OS != "mac" and enable_pepper_cdms==1', {
           'cflags': ['-fvisibility=hidden'],
           'type': 'loadable_module',
           # Allow the plugin wrapper to find the CDM in the same directory.
           'ldflags': ['-Wl,-rpath=\$$ORIGIN'],
           'libraries': [
             # Built by clearkeycdm.
             '<(PRODUCT_DIR)/libclearkeycdm.so',
@@ skipping 14 matching lines @@
               '-Wl,-exported_symbol,_PPP_InitializeModule',
               '-Wl,-exported_symbol,_PPP_ShutdownModule'
             ],
             'DYLIB_INSTALL_NAME_BASE': '@loader_path',
           },
         }],
       ],
     }
   ],
 }