Patch for bug 74983 (among others) to be applied to M11 696 branch.

chrome/chrome_tests.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.
 
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 2243 matching lines @@
         'browser/extensions/extension_webglbackground_apitest.cc',
         'browser/extensions/extension_webnavigation_apitest.cc',
         'browser/extensions/extension_webrequest_apitest.cc',
         'browser/extensions/extension_websocket_apitest.cc',
         'browser/extensions/extension_webstore_private_browsertest.cc',
         'browser/extensions/notifications_apitest.cc',
         'browser/extensions/page_action_apitest.cc',
         'browser/extensions/permissions_apitest.cc',
         'browser/extensions/stubs_apitest.cc',
         'browser/extensions/window_open_apitest.cc',
-        'browser/file_path_watcher/file_path_watcher_browsertest.cc',
         'browser/first_run/first_run_browsertest.cc',
         'browser/geolocation/access_token_store_browsertest.cc',
         'browser/geolocation/geolocation_browsertest.cc',
         'browser/ui/gtk/view_id_util_browsertest.cc',
         'browser/history/history_browsertest.cc',
         'browser/idbbindingutilities_browsertest.cc',
         'browser/net/cookie_policy_browsertest.cc',
         'browser/net/ftp_browsertest.cc',
         'browser/plugin_data_remover_browsertest.cc',
         'browser/policy/device_management_backend_mock.cc',
@@ skipping 55 matching lines @@
         '../content/browser/in_process_webkit/indexed_db_browsertest.cc',
         '../content/browser/plugin_service_browsertest.cc',
         '../content/browser/renderer_host/render_process_host_browsertest.cc',
         '../content/browser/renderer_host/render_view_host_browsertest.cc',
         '../content/browser/renderer_host/render_view_host_manager_browsertest.cc',
         '../content/browser/speech/speech_input_browsertest.cc',
         '../content/browser/webui/web_ui_browsertest.cc',
         '../content/browser/webui/web_ui_browsertest.h',
         '../content/browser/webui/web_ui_handler_browsertest.cc',
         '../content/browser/webui/web_ui_handler_browsertest.h',
+        '../content/common/file_path_watcher/file_path_watcher_browsertest.cc',
       ],
       'conditions': [
         ['chromeos==0', {
           'sources/': [
             ['exclude', '^browser/chromeos'],
           ],
           'sources!': [
             'browser/ui/webui/file_browse_browsertest.cc',
             'browser/ui/webui/mediaplayer_browsertest.cc',
           ],
@@ skipping 1449 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: