(reland) media: Use platform specific folders for CDMs

chrome/chrome_tests.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': {
     'build_angle_deqp_tests%': 0,
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
@@ skipping 2653 matching lines @@
         }, {
           'sources!': [ 'browser/ui/webui/app_list/start_page_browsertest.js' ],
         }],
         ['enable_service_discovery==1', {
           'sources': [ '<@(chrome_browser_tests_service_discovery_sources)' ],
         }],
         ['enable_supervised_users==1', {
           '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.
+            '../media/media.gyp:clearkeycdmadapter',
             '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
-            '../media/media.gyp:clearkeycdmadapter',
           ],
         }],
         ['enable_print_preview==0', {
           'sources!': [
             'browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc',
             'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc',
             'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc',
             'browser/printing/print_preview_dialog_controller_browsertest.cc',
             'browser/printing/print_preview_pdf_generated_browsertest.cc',
             'browser/service_process/service_process_control_browsertest.cc',
@@ skipping 461 matching lines @@
       'sources': [
         'browser/load_library_perf_test.cc',
       ],
       'include_dirs': [
         '..',
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'conditions': [
         ['enable_pepper_cdms==1', {
           'dependencies': [
+            'test_support_common',
+            '../media/media.gyp:cdm_paths',
             # Runtime dependencies.
             '../media/media.gyp:clearkeycdmadapter',
             '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
           ],
         }],
       ],
     },  # target 'load_library_perf_tests'
   ],
   'conditions': [
     ['OS == "android"', {
@@ skipping 436 matching lines @@
             'browser',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }