Revert of media: Use platform specific folders for CDMs

chrome/browser_tests.isolate

 # 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.
 {
   'conditions': [
     ['use_x11==0', {
       'variables': {
         'command': [
           '../testing/test_env.py',
           '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
@@ skipping 165 matching lines @@
     ['disable_nacl==0 and OS=="linux" and (target_arch=="x64" or target_arch=="ia32")', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32_nonsfi.nexe',
         ],
       },
     }],
     ['OS=="mac"', {
       'variables': {
         'files': [
+          '<(PRODUCT_DIR)/clearkeycdmadapter.plugin',
           '<(PRODUCT_DIR)/content_shell.pak',
+          '<(PRODUCT_DIR)/libclearkeycdm.dylib',
           '<(PRODUCT_DIR)/osmesa.so',
           '<(PRODUCT_DIR)/power_saver_test_plugin.plugin/Contents/MacOS/power_saver_test_plugin',
           '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
         ],
       },
     }],
-    # We don't support ia32 target for mac. Still check arch for completeness.
-    ['OS=="mac" and target_arch=="x64"', {
+    ['OS=="mac" and branding=="Chrome" and enable_pepper_cdms==1', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/mac_x64/clearkeycdmadapter.plugin',
-          '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/mac_x64/libclearkeycdm.dylib',
+          '<(PRODUCT_DIR)/libwidevinecdm.dylib',
+          '<(PRODUCT_DIR)/widevinecdmadapter.plugin',
         ],
       },
     }],
-    ['OS=="mac" and target_arch=="x64" and branding=="Chrome" and enable_pepper_cdms==1', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/mac_x64/libwidevinecdm.dylib',
-          '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/mac_x64/widevinecdmadapter.plugin',
-        ],
-      },
-    }],
     ['OS=="win"', {
       'variables': {
         'files': [
           '../native_client/build/build_nexe.py',
           '<(PRODUCT_DIR)/chrome_elf.dll',
+          '<(PRODUCT_DIR)/clearkeycdm.dll',
+          '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
           '<(PRODUCT_DIR)/crashpad_handler.exe',
           '<(PRODUCT_DIR)/power_saver_test_plugin.dll',
           '<(PRODUCT_DIR)/ppapi_tests.dll',
           'tools/build/repack_locales.py',
         ],
       },
     }],
-    ['OS=="win" and target_arch=="ia32"', {
+    ['OS=="win" and branding=="Chrome" and enable_pepper_cdms==1', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/win_x86/clearkeycdm.dll',
-          '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/win_x86/clearkeycdmadapter.dll',
+          '<(PRODUCT_DIR)/widevinecdm.dll',
+          '<(PRODUCT_DIR)/widevinecdmadapter.dll',
         ],
       },
     }],
-    ['OS=="win" and target_arch=="x64"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/win_x64/clearkeycdm.dll',
-          '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/win_x64/clearkeycdmadapter.dll',
-        ],
-      },
-    }],
-    ['OS=="win" and target_arch=="ia32" and branding=="Chrome" and enable_pepper_cdms==1', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x86/clearkeycdm.dll',
-          '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x86/clearkeycdmadapter.dll',
-        ],
-      },
-    }],
-    ['OS=="win" and target_arch=="x64" and branding=="Chrome" and enable_pepper_cdms==1', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x64/clearkeycdm.dll',
-          '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x64/clearkeycdmadapter.dll',
-        ],
-      },
-    }],
     ['OS=="win" and target_arch=="ia32"', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/wow_helper.exe',
         ],
       },
     }],
     ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
       'variables': {
         'files': [
@@ skipping 31 matching lines @@
           'browser/chromeos/login/test/https_forwarder.py',
         ],
       },
     }],
   ],
   'includes': [
     '../base/base.isolate',
     'chrome.isolate',
   ],
 }