Reland of "Convert Widevine and Android platform key systems to KeySystemProperties" with fix

components/cdm.gypi

 # Copyright 2014 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.
 
 {
   'targets': [
     {
       # GN verison: //components/cdm/common
       'target_name': 'cdm_common',
       'type': 'static_library',
@@ skipping 20 matching lines @@
       # GN version: //components/cdm/renderer
       'target_name': 'cdm_renderer',
       'type': 'static_library',
       'dependencies': [
         'cdm_common',
         '../base/base.gyp:base',
         '../content/content.gyp:content_renderer',
         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
       ],
       'include_dirs': [
-        # Needed by widevine_key_systems.cc.
+        # Needed by widevine_key_system_properties.cc.
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [
-        'cdm/renderer/widevine_key_systems.cc',
-        'cdm/renderer/widevine_key_systems.h',
+        'cdm/renderer/widevine_key_system_properties.cc',
+        'cdm/renderer/widevine_key_system_properties.h',
       ],
       'conditions': [
         ['OS == "android"', {
           'sources': [
             'cdm/renderer/android_key_systems.cc',
             'cdm/renderer/android_key_systems.h',
           ],
         }],
       ],
     },
@@ skipping 14 matching lines @@
           ],
           'sources': [
             'cdm/browser/cdm_message_filter_android.cc',
             'cdm/browser/cdm_message_filter_android.h',
           ],
         },
       ],
     }],
   ],
 }