Componentize EncryptedMediaMessageFilter and rename it CdmMessageFilter.

chrome/chrome_browser.gypi

 # Copyright 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 1053 matching lines @@
         'browser/media/chrome_midi_permission_context.cc',
         'browser/media/chrome_midi_permission_context.h',
         'browser/media/chrome_midi_permission_context_factory.cc',
         'browser/media/chrome_midi_permission_context_factory.h',
         'browser/media/desktop_media_list.h',
         'browser/media/desktop_media_list_ash.cc',
         'browser/media/desktop_media_list_ash.h',
         'browser/media/desktop_media_picker.h',
         'browser/media/desktop_streams_registry.cc',
         'browser/media/desktop_streams_registry.h',
-        'browser/media/encrypted_media_message_filter_android.cc',
-        'browser/media/encrypted_media_message_filter_android.h',
         'browser/media/media_capture_devices_dispatcher.cc',
         'browser/media/media_capture_devices_dispatcher.h',
         'browser/media/media_device_id_salt.cc',
         'browser/media/media_device_id_salt.h',
         'browser/media/media_stream_capture_indicator.cc',
         'browser/media/media_stream_capture_indicator.h',
         'browser/media/media_stream_devices_controller.cc',
         'browser/media/media_stream_devices_controller.h',
         'browser/media/media_stream_infobar_delegate.cc',
         'browser/media/media_stream_infobar_delegate.h',
@@ skipping 2048 matching lines @@
             'browser/metrics/variations/variations_request_scheduler_mobile.cc',
             'browser/metrics/variations/variations_request_scheduler_mobile.h',
             'browser/net/spdyproxy/data_reduction_proxy_settings.cc',
             'browser/net/spdyproxy/data_reduction_proxy_settings.h',
             'browser/net/spdyproxy/proxy_advisor.cc',
             'browser/net/spdyproxy/proxy_advisor.h',
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
+            '../components/components.gyp:cdm_browser',
             '../components/components.gyp:web_contents_delegate_android',
             'chrome_browser_jni_headers',
           ],
           'dependencies!': [
             '../components/components.gyp:storage_monitor',
             '../components/components.gyp:usb_service',
             '../components/components.gyp:web_modal',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
           ],
           'sources': [
@@ skipping 576 matching lines @@
             'package_name': 'org/chromium/chrome/browser',
             'template_deps': ['browser/android/tab_load_status.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }