Reland 56341 - Add support for watching directories to FileWatcher.

BUG=none
TEST=Unit tests in file_watcher_unittest.cc.

Review URL: http://codereview.chromium.org/3184010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56670 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index c8533ac..747cc69b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1445,10 +1445,10 @@
         'browser/fav_icon_helper.h',
         'browser/favicon_service.cc',
         'browser/favicon_service.h',
-        'browser/file_watcher.h',
-        'browser/file_watcher_inotify.cc',
-        'browser/file_watcher_mac.cc',
-        'browser/file_watcher_win.cc',
+        'browser/file_path_watcher.h',
+        'browser/file_path_watcher_inotify.cc',
+        'browser/file_path_watcher_mac.cc',
+        'browser/file_path_watcher_win.cc',
         'browser/file_system_proxy.cc',
         'browser/file_system_proxy.h',
         'browser/find_bar.h',
@@ -3107,7 +3107,7 @@
           ],
         }, {  # OS != "linux"
           'sources!': [
-            'browser/file_watcher_inotify.cc',
+            'browser/file_path_watcher_inotify.cc',
           ],
         }],
         ['OS=="freebsd" or OS=="openbsd"', {
@@ -3117,7 +3117,7 @@
             '../build/linux/system.gyp:nss',
           ],
           'sources': [
-            'browser/file_watcher_stub.cc',
+            'browser/file_path_watcher_stub.cc',
           ],
         }],
         ['OS=="mac"', {