Revert 217768 "Adding key press detection in the browser process."

trunk/src/media/media.gyp

 # Copyright (c) 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 286 matching lines @@
         'base/simd/filter_yuv_c.cc',
         'base/simd/yuv_to_rgb_table.cc',
         'base/simd/yuv_to_rgb_table.h',
         'base/sinc_resampler.cc',
         'base/sinc_resampler.h',
         'base/stream_parser.cc',
         'base/stream_parser.h',
         'base/stream_parser_buffer.cc',
         'base/stream_parser_buffer.h',
         'base/text_track.h',
-        'base/user_input_monitor.cc',
-        'base/user_input_monitor.h',
-        'base/user_input_monitor_linux.cc',
-        'base/user_input_monitor_mac.mm',
-        'base/user_input_monitor_win.cc',
         'base/video_decoder.cc',
         'base/video_decoder.h',
         'base/video_decoder_config.cc',
         'base/video_decoder_config.h',
         'base/video_frame.cc',
         'base/video_frame.h',
         'base/video_renderer.cc',
         'base/video_renderer.h',
         'base/video_util.cc',
         'base/video_util.h',
@@ skipping 217 matching lines @@
             ['include', '^audio/audio_manager_base\\.'],
             ['include', '^audio/audio_parameters\\.'],
             ['include', '^audio/fake_audio_consumer\\.'],
             ['include', '^audio/fake_audio_input_stream\\.'],
             ['include', '^audio/fake_audio_output_stream\\.'],
             ['include', '^base/audio_bus\\.'],
             ['include', '^base/channel_layout\\.'],
             ['include', '^base/media\\.cc$'],
             ['include', '^base/media_stub\\.cc$'],
             ['include', '^base/media_switches\\.'],
-            ['include', '^base/user_input_monitor\\.'],
             ['include', '^base/vector_math\\.'],
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
               '$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreMIDI.framework',
             ],
           },
-          'defines': [
-            'DISABLE_USER_INPUT_MONITOR',
-          ],
         }],
         ['OS=="android"', {
           'link_settings': {
             'libraries': [
               '-lOpenSLES',
             ],
           },
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/media',
           ],
           'dependencies': [
             'media_android_jni_headers',
             'player_android',
             'video_capture_android_jni_headers',
           ],
           'sources': [
             'base/media.cc',
             'base/media.h',
             'base/media_stub.cc',
           ],
           'conditions': [
             ['android_webview_build==0', {
               'dependencies': [
                 'media_java',
               ],
             }],
           ],
-          'defines': [
-            'DISABLE_USER_INPUT_MONITOR',
-          ],
         }],
         # A simple WebM encoder for animated avatars on ChromeOS.
         ['chromeos==1', {
           'dependencies': [
             '../third_party/libvpx/libvpx.gyp:libvpx',
             '../third_party/libyuv/libyuv.gyp:libyuv',
           ],
           'sources': [
             'webm/chromeos/ebml_writer.cc',
             'webm/chromeos/ebml_writer.h',
             'webm/chromeos/webm_encoder.cc',
             'webm/chromeos/webm_encoder.h',
           ],
-          'defines': [
-            # TODO(jiayl): figure out why MediaStreamInfoBarTest.
-            # DenyingCameraDoesNotCauseStickyDenyForMics fails on ChromeOS and
-            # remove this.
-            'DISABLE_USER_INPUT_MONITOR',
-          ],
-          'sources!': [
-            'base/user_input_monitor_linux.cc',
-          ],
         }],
         ['use_alsa==1', {
           'link_settings': {
             'libraries': [
               '-lasound',
             ],
           },
         }, { # use_alsa==0
           'sources/': [ ['exclude', '/alsa_'],
                       ['exclude', '/audio_manager_linux'] ],
@@ skipping 15 matching lines @@
             ],
           },
           'conditions': [
             ['use_x11==1', {
               'link_settings': {
                 'libraries': [
                   '-lX11',
                   '-lXdamage',
                   '-lXext',
                   '-lXfixes',
-                  '-lXtst',
                 ],
               },
-            }, {  # else: use_x11==0
-              'sources!': [
-                'base/user_input_monitor_linux.cc',
-              ],
-              'defines': [
-                'DISABLE_USER_INPUT_MONITOR',
-              ],
             }],
             ['use_cras==1', {
               'cflags': [
                 '<!@(<(pkg-config) --cflags libcras)',
               ],
               'link_settings': {
                 'libraries': [
                   '<!@(<(pkg-config) --libs libcras)',
                 ],
               },
@@ skipping 1006 matching lines @@
           'sources': [
             'tools/media_bench/media_bench.cc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         },
       ],
     }],
   ],
 }