Remove DirectoryWatcher and the only thing using it.

DirectoryWatcher was problematic. We couldn't get it right on Linux,
it can hit the disk on UI thread on Windows (Really Bad, tm). And
finally, the UserScriptMaster didn't work right with it.

TEST=Covered by unit_tests and browser_tests
BUG=8968, 6051, 6080, 20832

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38456 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 30 deletions

diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc
index d142e0a..3478b68 100644
--- a/chrome/browser/extensions/user_script_master.cc
+++ b/chrome/browser/extensions/user_script_master.cc
@@ -289,9 +289,6 @@ UserScriptMaster::UserScriptMaster(const FilePath& script_dir, Profile* profile)
       extensions_service_ready_(false),
       pending_scan_(false),
       profile_(profile) {
-  if (!user_script_dir_.value().empty())
-    AddWatchedPath(script_dir);
-
   registrar_.Add(this, NotificationType::EXTENSIONS_READY,
                  Source<Profile>(profile_));
   registrar_.Add(this, NotificationType::EXTENSION_LOADED,
@@ -303,22 +300,6 @@ UserScriptMaster::UserScriptMaster(const FilePath& script_dir, Profile* profile)
 UserScriptMaster::~UserScriptMaster() {
   if (script_reloader_)
     script_reloader_->DisownMaster();
-
-// TODO(aa): Enable this when DirectoryWatcher is implemented for linux.
-#if defined(OS_WIN) || defined(OS_MACOSX)
-  STLDeleteElements(&dir_watchers_);
-#endif
-}
-
-void UserScriptMaster::AddWatchedPath(const FilePath& path) {
-// TODO(aa): Enable this when DirectoryWatcher is implemented for linux.
-#if defined(OS_WIN) || defined(OS_MACOSX)
-  DirectoryWatcher* watcher = new DirectoryWatcher();
-  base::Thread* file_thread = g_browser_process->file_thread();
-  watcher->Watch(path, this, file_thread ? file_thread->message_loop() : NULL,
-                 true);
-  dir_watchers_.push_back(watcher);
-#endif
 }
 
 void UserScriptMaster::NewScriptsAvailable(base::SharedMemory* handle) {
@@ -343,17 +324,6 @@ void UserScriptMaster::NewScriptsAvailable(base::SharedMemory* handle) {
   }
 }
 
-void UserScriptMaster::OnDirectoryChanged(const FilePath& path) {
-  if (script_reloader_.get()) {
-    // We're already scanning for scripts.  We note that we should rescan when
-    // we get the chance.
-    pending_scan_ = true;
-    return;
-  }
-
-  StartScan();
-}
-
 void UserScriptMaster::Observe(NotificationType type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {