Move FileWatcher from src/base/ to src/chrome/browser/ and switch

base/base.gypi

 # Copyright (c) 2010 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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 275 matching lines @@
         ],
         'conditions': [
           [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd"', {
               'sources/': [
                 ['exclude', '/xdg_user_dirs/'],
                 ['exclude', '_nss\.cc$'],
               ],
               'sources!': [
                 'atomicops_internals_x86_gcc.cc',
                 'base_paths_posix.cc',
-                'file_watcher_inotify.cc',
                 'linux_util.cc',
                 'message_pump_glib.cc',
               ],
           },],
           [ 'OS != "linux"', {
               'sources!': [
                 # Not automatically excluded by the *linux.cc rules.
                 'setproctitle_linux.c',
                 'setproctitle_linux.h',
               ],
             },
           ],
           # For now, just test the *BSD platforms enough to exclude them.
           # Subsequent changes will include them further.
           [ 'OS != "freebsd"', {
               'sources/': [ ['exclude', '_freebsd\\.cc$'] ],
             },
           ],
           [ 'OS != "openbsd"', {
               'sources/': [ ['exclude', '_openbsd\\.cc$'] ],
             },
           ],
-          [ 'GENERATOR == "quentin"', {
-              # Quentin builds don't have a recent enough glibc to include the
-              # inotify headers
-              'sources!': [
-                'file_watcher_inotify.cc',
-              ],
-              'sources': [
-                'file_watcher_stub.cc',
-              ],
-            },
-          ],
           [ 'OS == "mac"', {
               'sources!': [
                 # TODO(wtc): Remove nss_util.{cc,h} when http://crbug.com/30689
                 # is fixed.
                 'nss_util.cc',
                 'nss_util.h',
               ],
           }, {  # OS != "mac"
               'sources!': [
                 'crypto/cssm_init.cc',
@@ skipping 74 matching lines @@
             'USE_SYMBOLIZE',
           ],
           'cflags': [
             '-Wno-write-strings',
           ],
           'export_dependent_settings': [
             '../build/linux/system.gyp:gtk',
           ],
         },],
         [ 'OS == "freebsd" or OS == "openbsd"', {
-            'sources!': [
-              'file_watcher_inotify.cc',
-            ],
-            'sources': [
-              'file_watcher_stub.cc',
-            ],
             'link_settings': {
               'libraries': [
                 '-L/usr/local/lib -lexecinfo',
               ],
             },
           },
         ],
         [ 'OS == "mac"', {
             'link_settings': {
               'libraries': [
@@ skipping 59 matching lines @@
         'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
         'third_party/xdg_user_dirs/xdg_user_dir_lookup.h',
         'auto_reset.h',
         'base64.cc',
         'base64.h',
         'base_drag_source.cc',
         'base_drag_source.h',
         'base_drop_target.cc',
         'base_drop_target.h',
         'data_pack.cc',
-        'file_watcher.h',
-        'file_watcher_inotify.cc',
-        'file_watcher_mac.cc',
-        'file_watcher_win.cc',
         'dynamic_annotations.h',
         'dynamic_annotations.cc',
         'event_recorder.cc',
         'event_recorder.h',
         'event_recorder_stubs.cc',
         'field_trial.cc',
         'field_trial.h',
         'file_descriptor_shuffle.cc',
         'file_descriptor_shuffle.h',
         'hmac.h',
@@ skipping 120 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }