Revert "Revert "media: Move widevine CDM targets to WidevineCdm folder""

chrome/browser_tests.isolate

Index: chrome/browser_tests.isolate
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index cec61ef8c68b209f94436d80e6422e3f1af5c243..b27b1535e50c6b739fd3688c47f673ee30b602f0 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -183,20 +183,42 @@
     ['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',
         ],
       },
     }],
-    ['OS=="mac" and branding=="Chrome" and enable_pepper_cdms==1', {
+    ['OS=="mac" and target_arch=="ia32"', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/libwidevinecdm.dylib',
-          '<(PRODUCT_DIR)/widevinecdmadapter.plugin',
+          '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/mac_x86/clearkeycdmadapter.plugin',
+          '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/mac_x86/libclearkeycdm.dylib',
+        ],
+      },
+    }],
+    ['OS=="mac" and target_arch=="x64"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/mac_x64/clearkeycdmadapter.plugin',
+          '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/mac_x64/libclearkeycdm.dylib',
+        ],
+      },
+    }],
+    ['OS=="mac" and branding=="Chrome" and enable_pepper_cdms==1 and target_arch=="ia32"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/mac_x86/libwidevinecdm.dylib',
+          '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/mac_x86/widevinecdmadapter.plugin',
+        ],
+      },
+    }],
+    ['OS=="mac" and branding=="Chrome" and enable_pepper_cdms==1 and target_arch=="x64"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/mac_x64/libwidevinecdm.dylib',
+          '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/mac_x64/widevinecdmadapter.plugin',
         ],
       },
     }],
@@ -205,8 +227,6 @@
         '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',
@@ -214,11 +234,35 @@
         ],
       },
     }],
-    ['OS=="win" and branding=="Chrome" and enable_pepper_cdms==1', {
+    ['OS=="win" and target_arch=="ia32"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/win_x86/clearkeycdm.dll',
+          '<(PRODUCT_DIR)/ClearKeyCdm/_platform_specific/win_x86/clearkeycdmadapter.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 branding=="Chrome" and enable_pepper_cdms==1 and target_arch=="ia32"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x86/clearkeycdm.dll',
+          '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x86/clearkeycdmadapter.dll',
+        ],
+      },
+    }],
+    ['OS=="win" and branding=="Chrome" and enable_pepper_cdms==1 and target_arch=="x64"', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/widevinecdm.dll',
-          '<(PRODUCT_DIR)/widevinecdmadapter.dll',
+          '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x64/clearkeycdm.dll',
+          '<(PRODUCT_DIR)/WidevineCdm/_platform_specific/win_x64/clearkeycdmadapter.dll',
         ],
       },
     }],