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

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': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
@@ skipping 1065 matching lines @@
         'browser/extensions/user_script_master.cc',
         'browser/extensions/user_script_master.h',
         'browser/external_protocol_handler.cc',
         'browser/external_protocol_handler.h',
         'browser/external_tab_container_win.cc',
         'browser/external_tab_container_win.h',
         'browser/fav_icon_helper.cc',
         'browser/fav_icon_helper.h',
         'browser/favicon_service.cc',
         'browser/favicon_service.h',
-        'browser/file_path_watcher/file_path_watcher.cc',
-        'browser/file_path_watcher/file_path_watcher.h',
-        'browser/file_path_watcher/file_path_watcher_inotify.cc',
-        'browser/file_path_watcher/file_path_watcher_mac.cc',
-        'browser/file_path_watcher/file_path_watcher_win.cc',
         'browser/file_select_helper.cc',
         'browser/file_select_helper.h',
         'browser/first_run/first_run.cc',
         'browser/first_run/first_run.h',
         'browser/first_run/first_run_gtk.cc',
         'browser/first_run/first_run_mac.mm',
         'browser/first_run/first_run_win.cc',
         'browser/fonts_languages_window.h',
         'browser/fullscreen.h',
         'browser/fullscreen_linux.cc',
@@ skipping 2420 matching lines @@
               ],
             }],
             ['linux_sandbox_path != ""', {
               'defines': [
                 'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"',
               ],
             }],
           ],
         }, {  # OS != "linux"
           'sources!': [
-            'browser/file_path_watcher/file_path_watcher_inotify.cc',
             'browser/ui/webui/options/certificate_manager_handler.cc',
             'browser/ui/webui/options/certificate_manager_handler.h',
           ],
         }],
         ['OS=="freebsd" or OS=="openbsd"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:gtkprint',
             '../build/linux/system.gyp:nss',
             '../build/linux/system.gyp:x11',
           ],
-          'sources': [
-            'browser/file_path_watcher/file_path_watcher_stub.cc',
-          ],
         }],
         # Use system SSL settings on Mac and Windows.  Use preferences
         # for SSL settings on other platforms.
         ['OS=="mac" or OS=="win"', {
           'sources!': [
             'browser/net/ssl_config_service_manager_pref.cc',
           ],
         }, {  # else
           'sources!': [
             'browser/net/ssl_config_service_manager_system.cc',
@@ skipping 880 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: