media: Use platform specific folders for CDMs

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 658e79ee609618041f561ccbaac15d40877981fc..891f2f837a340fa637be1750791b7552c9015588 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2671,14 +2671,10 @@
           'sources': [ '<@(chrome_browser_tests_supervised_user_sources)' ],
         }],
         ['enable_pepper_cdms==1', {
-          'sources' : [
-            'browser/media/pepper_cdm_test_helper.cc',
-            'browser/media/pepper_cdm_test_helper.h',
-          ],
           'dependencies': [
             # Runtime dependencies.
-            '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
             '../media/media.gyp:clearkeycdmadapter',
+            '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
           ],
         }],
         ['enable_print_preview==0', {
@@ -3145,6 +3141,7 @@
       'target_name': 'load_library_perf_tests',
       'type': '<(gtest_target_type)',
       'dependencies': [
+        'test_support_common',
         '../base/base.gyp:test_support_perf',
         '../testing/gtest.gyp:gtest',
         '../testing/perf/perf_test.gyp:*',
@@ -3162,6 +3159,7 @@
           'dependencies': [
             # Runtime dependencies.
             '../media/media.gyp:clearkeycdmadapter',
+            '../media/media.gyp:media',

[ddorwin, 2016/05/19 00:04:26]

Is this for the CDM paths file?

[xhwang, 2016/05/20 00:22:35]

Done.

             '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
           ],
         }],