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)),
+      dispatch_directory_change_event_impl_(
+          base::Bind(&EventRouter::DispatchDirectoryChangeEventImpl,
+                     base::Unretained(this))),
       weak_factory_(this) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ObserveEvents();
 }
 
 EventRouter::~EventRouter() {
 }
 
 void EventRouter::Shutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 305 matching lines @@
   BroadcastEvent(profile_,
                  file_manager_private::OnFileTransfersUpdated::kEventName,
                  file_manager_private::OnFileTransfersUpdated::Create(status));
 }
 
 void EventRouter::OnDirectoryChanged(const base::FilePath& drive_path) {
   HandleFileWatchNotification(NULL, drive_path, false);
 }
 
 void EventRouter::OnFileChanged(const drive::FileChange& changed_files) {
+  // In this method, we convert changed_files to a map which can be handled by
+  // HandleFileWatchNotification.
+  //
+  // e.g.
+  // /a/b DIRECTORY:DELETE
+  //
+  // map[/a] = /a/b DIRECTORY:DELETE
+  // map[/a/b] = /a/b DIRECTORY:DELETE
+  //
+  // We used the key of map to match the watched directories of file watchers.
   typedef std::map<base::FilePath, drive::FileChange> FileChangeMap;
+  typedef drive::FileChange::ChangeList::List FileChangeList;
 
   FileChangeMap map;
   const drive::FileChange::Map& changed_file_map = changed_files.map();
-  for (drive::FileChange::Map::const_iterator it = changed_file_map.begin();
-       it != changed_file_map.end();
-       it++) {
-    const base::FilePath& path = it->first;
-    map[path.DirName()].Update(path, it->second);
+  for (auto const& file_change_key_value : changed_file_map) {
+    bool contains_directory_deletion = false;

[mtomasz, 2014/10/21 07:16:56]

nit: Please add a comment what actually 'contains_directory_deletion' mean. I
was confused by it. Basically if contains_directory_deletion is true, then the
directory under that path was removed. 'contains' suggests that a child is
deleted, but it's not true.

[yawano, 2014/10/21 08:40:16]

Done.

+    const FileChangeList list = file_change_key_value.second.list();
+    for (drive::FileChange::Change const& change : list) {
+      if (change.IsDirectory() && change.IsDelete()) {
+        contains_directory_deletion = true;
+        break;
+      }
+    }
+
+    const base::FilePath& path = file_change_key_value.first;
+    map[path.DirName()].Update(path, file_change_key_value.second);
+
+    // For deletion of a directory, onFileChanged gets different changed_files.
+    // We solve the difference here.
+    //
+    // /a/b is watched, and /a is deleted from Drive (e.g. from Web).
+    // 1. /a/b DELETE:DIRECTORY
+    // 2. /a DELETE:DIRECTORY
+    //
+    // /a/b is watched, and /a is deleted from Files.app.
+    // 1. /a DELETE:DIRECTORY
+    if (contains_directory_deletion) {
+      // Expand the deleted directory path with watched paths.
+      for (WatcherMap::const_iterator file_watchers_it =
+               file_watchers_.lower_bound(path);
+           file_watchers_it != file_watchers_.end() &&

[mtomasz, 2014/10/21 07:16:56]

What if we have watchers on /a and /aaa. Will /aaa be notified if /a is removed?

[yawano, 2014/10/21 08:40:16]

This was a error case in the previous CL. I added test case for this, and fixed
it. IsParent of FilePath checks whether the path is ancestor or not.

e.g.
(/a).IsParent(/a/b) -> true
(/a).IsParent(/a/b/c) -> true
(/a).IsParent(/aaa) -> false

Definition of IsParent.
https://code.google.com/p/chromium/codesearch#chromium/src/base/files/file_pa...

+               file_watchers_it->first.value().find(path.value()) == 0;
+           ++file_watchers_it) {
+        map[file_watchers_it->first].Update(
+            file_watchers_it->first,
+            drive::FileChange::FileType::FILE_TYPE_DIRECTORY,
+            drive::FileChange::ChangeType::DELETE);
+      }
+    }
   }
 
-  for (FileChangeMap::const_iterator it = map.begin(); it != map.end(); it++) {
-    HandleFileWatchNotification(&(it->second), it->first, false);
+  for (auto const& file_change_key_value : map) {
+    HandleFileWatchNotification(&(file_change_key_value.second),
+                                file_change_key_value.first, false);
   }
 }
 
 void EventRouter::OnDriveSyncError(drive::file_system::DriveSyncErrorType type,
                                    const base::FilePath& drive_path) {
   file_manager_private::DriveSyncErrorEvent event;
   switch (type) {
     case drive::file_system::DRIVE_SYNC_ERROR_DELETE_WITHOUT_PERMISSION:
       event.type =
           file_manager_private::DRIVE_SYNC_ERROR_TYPE_DELETE_WITHOUT_PERMISSION;
@@ skipping 47 matching lines @@
                                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_directory_change_event_impl_.Run(virtual_path, 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::SetDispatchDirectoryChangeEventImplForTesting(
+    const DispatchDirectoryChangeEventImplCallback& callback) {
+  dispatch_directory_change_event_impl_ = callback;
+}
+
 }  // namespace file_manager