Revert 109285 - Seems to have broken chrome_frame_net_tests on the win_rel trybot, stuffing up th...

chrome/chrome_browser.gypi

 # Copyright (c) 2011 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',
       'dependencies': [
@@ skipping 1197 matching lines @@
         'browser/extensions/settings/settings_storage.cc',
         'browser/extensions/settings/settings_storage.h',
         'browser/extensions/settings/settings_storage_cache.cc',
         'browser/extensions/settings/settings_storage_cache.h',
         'browser/extensions/settings/settings_storage_quota_enforcer.cc',
         'browser/extensions/settings/settings_storage_quota_enforcer.h',
         'browser/extensions/settings/settings_sync_util.cc',
         'browser/extensions/settings/settings_sync_util.h',
         'browser/extensions/settings/syncable_settings_storage.cc',
         'browser/extensions/settings/syncable_settings_storage.h',
+        'browser/extensions/speech_input/extension_speech_input_api.cc',
+        'browser/extensions/speech_input/extension_speech_input_api.h',
+        'browser/extensions/speech_input/extension_speech_input_api_constants.cc',
+        'browser/extensions/speech_input/extension_speech_input_api_constants.h',
+        'browser/extensions/speech_input/extension_speech_input_manager.cc',
+        'browser/extensions/speech_input/extension_speech_input_manager.h',
         'browser/extensions/theme_installed_infobar_delegate.cc',
         'browser/extensions/theme_installed_infobar_delegate.h',
         'browser/extensions/unpacked_installer.cc',
         'browser/extensions/unpacked_installer.h',
         'browser/extensions/user_script_listener.cc',
         'browser/extensions/user_script_listener.h',
         'browser/extensions/user_script_master.cc',
         'browser/extensions/user_script_master.h',
         'browser/extensions/webstore_inline_installer.cc',
         'browser/extensions/webstore_inline_installer.h',
@@ skipping 884 matching lines @@
         'browser/speech/chrome_speech_input_manager.h',
         'browser/speech/chrome_speech_input_preferences.cc',
         'browser/speech/chrome_speech_input_preferences.h',
         'browser/speech/speech_input_bubble.cc',
         'browser/speech/speech_input_bubble.h',
         'browser/speech/speech_input_bubble_controller.cc',
         'browser/speech/speech_input_bubble_controller.h',
         'browser/speech/speech_input_bubble_gtk.cc',
         'browser/speech/speech_input_bubble_mac.mm',
         'browser/speech/speech_input_bubble_views.cc',
-        'browser/speech/speech_input_extension_api.cc',
-        'browser/speech/speech_input_extension_api.h',
-        'browser/speech/speech_input_extension_manager.cc',
-        'browser/speech/speech_input_extension_manager.h',
-        'browser/speech/speech_input_extension_notification.cc',
-        'browser/speech/speech_input_extension_notification.h',
         'browser/spellchecker/spellcheck_host.cc',
         'browser/spellchecker/spellcheck_host.h',
         'browser/spellchecker/spellcheck_host_impl.cc',
         'browser/spellchecker/spellcheck_host_impl.h',
         'browser/spellchecker/spellcheck_host_metrics.cc',
         'browser/spellchecker/spellcheck_host_metrics.h',
         'browser/spellchecker/spellcheck_message_filter.cc',
         'browser/spellchecker/spellcheck_message_filter.h',
         'browser/spellchecker/spellcheck_profile.cc',
         'browser/spellchecker/spellcheck_profile.h',
@@ skipping 3107 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }