Revert of media: Use platform specific folders for CDMs

media/media.gyp

Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index fb5291e2b8be9b04c8562e384df312abc3470289..573e4bd62b2d40ddc2b4d1aa5397198a75866d5f 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1106,24 +1106,11 @@
       ],  # target_conditions
     },
     {
-      # GN version: //media:cdm_paths
-      'target_name': 'cdm_paths',
-      'type': 'static_library',
-      'sources': [
-        'cdm/cdm_paths.cc',
-        'cdm/cdm_paths.h',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base',
-      ]
-    },
-    {
       # GN version: //media:media_unittests
       'target_name': 'media_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         'audio_test_config',
-        'cdm_paths',
         'media',
         'media_features',
         'media_test_support',
@@ -1340,13 +1327,6 @@
           'sources': [
             'cdm/cdm_adapter_unittest.cc',
           ],
-          'conditions': [
-            ['OS == "mac"', {
-              'xcode_settings': {
-                'LD_RUNPATH_SEARCH_PATHS' : [ '@executable_path/<(clearkey_cdm_path)' ],
-              },
-            }]
-           ],
         }],
         ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
           'sources': [