Changed api to notify when watched directory is deleted.

chrome/browser/chromeos/extensions/file_manager/event_router.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/chromeos/extensions/file_manager/event_router.h"
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_change_registrar.h"
@@ skipping 368 matching lines @@
 
 EventRouter::DriveJobInfoWithStatus::DriveJobInfoWithStatus(
     const drive::JobInfo& info, const std::string& status)
     : job_info(info), status(status) {
 }
 
 EventRouter::EventRouter(Profile* profile)
     : pref_change_registrar_(new PrefChangeRegistrar),
       profile_(profile),
       device_event_router_(new DeviceEventRouterImpl(profile)),
-      weak_factory_(this) {
+      weak_factory_(this),
+      dispatch_dir_change_eve_impl_(

[mtomasz, 2014/10/16 04:02:02]

ditto

[yawano, 2014/10/17 03:57:22]

Done.

+          base::Bind(&EventRouter::DispatchDirectoryChangeEventImpl,
+                     base::Unretained(this))) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ObserveEvents();
 }
 
 EventRouter::~EventRouter() {
 }
 
 void EventRouter::Shutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 360 matching lines @@
       profile_,
       file_manager_private::OnDriveConnectionStatusChanged::kEventName,
       file_manager_private::OnDriveConnectionStatusChanged::Create());
 }
 
 void EventRouter::HandleFileWatchNotification(const drive::FileChange* list,
                                               const base::FilePath& local_path,
                                               bool got_error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  WatcherMap::const_iterator iter = file_watchers_.find(local_path);
-  if (iter == file_watchers_.end()) {
-    return;
-  }
-
   if (list && list->size() > kDirectoryChangeEventMaxDetailInfoSize) {
     // Removes the detailed information, if the list size is more than
     // kDirectoryChangeEventMaxDetailInfoSize, since passing large list
     // and processing it may cause more itme.
     // This will be invoked full-refresh in Files.app.
     list = NULL;
   }
 
-  DispatchDirectoryChangeEvent(iter->second->virtual_path(),
-                               list,
-                               got_error,
-                               iter->second->GetExtensionIds());
+  // Since a change in the parent directory of a watching directory causes

[mtomasz, 2014/10/16 04:02:02]

What if we watch for /a/b only, and /a/b is removed? We won't get notifications
for parent? Will it work then?

[yawano, 2014/10/17 03:57:21]

While we changed the point to fix in the latest Cl, this logic works. 

If /a/b is deleted and it's in Drive, it is notified as a change of /a, and it
matches. If /a/b is deleted and it's on Local, it is notified as a change of
/a/b, and it also matches.

+  // deletion of the watching directory, we check whether the watching directory
+  // exists and notify if it is deleted.
+  for (WatcherMap::const_iterator iter = file_watchers_.lower_bound(local_path);
+       iter != file_watchers_.end() &&
+       iter->first.value().find(local_path.value()) == 0;
+       ++iter) {
+    // If a change has happend in the parent directory, checks the descendant
+    // directory(watching directory) still exists.
+    if (local_path.value().size() < iter->first.value().size() &&
+        base::PathExists(iter->first)) {

[mtomasz, 2014/10/16 04:02:02]

PathExists can't be called on UI thread. You have to do that on IO or FILE
thread or on a blocking pool.

[yawano, 2014/10/17 03:57:21]

Acknowledged.

+      continue;
+    }
+
+    DispatchDirectoryChangeEvent(iter->second->virtual_path(),
+                                list,
+                                got_error,
+                                iter->second->GetExtensionIds());
+  }
 }
 
 void EventRouter::DispatchDirectoryChangeEvent(
     const base::FilePath& virtual_path,
     const drive::FileChange* list,
     bool got_error,
     const std::vector<std::string>& extension_ids) {
+  dispatch_dir_change_eve_impl_.Run(virtual_path,

[mtomasz, 2014/10/16 04:02:02]

ditto

[yawano, 2014/10/17 03:57:21]

Done.

+                                    list, got_error, extension_ids);
+}
+
+void EventRouter::DispatchDirectoryChangeEventImpl(
+    const base::FilePath& virtual_path,
+    const drive::FileChange* list,
+    bool got_error,
+    const std::vector<std::string>& extension_ids) {
   if (!profile_) {
     NOTREACHED();
     return;
   }
   linked_ptr<drive::FileChange> changes;
   if (list)
     changes.reset(new drive::FileChange(*list));  // Copy
 
   for (size_t i = 0; i < extension_ids.size(); ++i) {
     std::string* extension_id = new std::string(extension_ids[i]);
@@ skipping 156 matching lines @@
 void EventRouter::Observe(int type,
                           const content::NotificationSource& source,
                           const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PROFILE_ADDED) {
     Profile* const added_profile = content::Source<Profile>(source).ptr();
     if (!added_profile->IsOffTheRecord())
       GrantAccessForAddedProfileToRunningInstance(added_profile, profile_);
   }
 }
 
+void EventRouter::SetDispatchDirChangeEveImplForTesting(
+    const DispatchDirChangeEveImplCallback& callback) {
+  dispatch_dir_change_eve_impl_ = callback;

[mtomasz, 2014/10/16 04:02:02]

ditto

[yawano, 2014/10/17 03:57:22]

Done.

+}
+
 }  // namespace file_manager