[fsp] Separate recursive and non-recursive watchers.

chrome/browser/chromeos/file_system_provider/provided_file_system.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/file_system_provider/provided_file_system.h"
 
 #include <vector>
 
 #include "base/debug/trace_event.h"
 #include "base/files/file.h"
@@ skipping 345 matching lines @@
   return base::Bind(
       &ProvidedFileSystem::Abort, weak_ptr_factory_.GetWeakPtr(), request_id);
 }
 
 ProvidedFileSystem::AbortCallback ProvidedFileSystem::ObserveDirectory(
     const base::FilePath& directory_path,
     bool recursive,
     const storage::AsyncFileUtil::StatusCallback& callback) {
   // TODO(mtomasz): Wrap the entire method body with an asynchronous queue to
   // avoid races.
-  const ObservedEntries::const_iterator it =
-      observed_entries_.find(directory_path);
+  const ObservedEntryKey key(directory_path, recursive);
+  const ObservedEntries::const_iterator it = observed_entries_.find(key);
   if (it != observed_entries_.end()) {
-    if (!recursive || it->second.recursive) {
-      callback.Run(base::File::FILE_ERROR_EXISTS);
-      return AbortCallback();
-    }
+    OnObserveDirectoryCompleted(
+        directory_path, recursive, callback, base::File::FILE_ERROR_EXISTS);
+    return AbortCallback();
   }
 
   const int request_id = request_manager_->CreateRequest(
       OBSERVE_DIRECTORY,
       scoped_ptr<RequestManager::HandlerInterface>(
           new operations::ObserveDirectory(
               event_router_,
               file_system_info_,
               directory_path,
               recursive,
               base::Bind(&ProvidedFileSystem::OnObserveDirectoryCompleted,
                          weak_ptr_factory_.GetWeakPtr(),
                          directory_path,
                          recursive,
                          callback))));
   if (!request_id) {
     callback.Run(base::File::FILE_ERROR_SECURITY);
     return AbortCallback();
   }
 
   return base::Bind(
       &ProvidedFileSystem::Abort, weak_ptr_factory_.GetWeakPtr(), request_id);
 }
 
 void ProvidedFileSystem::UnobserveEntry(
     const base::FilePath& entry_path,
+    bool recursive,
     const storage::AsyncFileUtil::StatusCallback& callback) {
-  const ObservedEntries::const_iterator it = observed_entries_.find(entry_path);
+  const ObservedEntryKey key(entry_path, recursive);
+  const ObservedEntries::const_iterator it = observed_entries_.find(key);
   if (it == observed_entries_.end()) {
     callback.Run(base::File::FILE_ERROR_NOT_FOUND);
     return;
   }
 
   // Delete the watcher in advance since the list of observed entries is owned
   // by the C++ layer, not by the extension.
   observed_entries_.erase(it);
 
   FOR_EACH_OBSERVER(
       ProvidedFileSystemObserver,
       observers_,
       OnObservedEntryListChanged(file_system_info_, observed_entries_));
 
   // TODO(mtomasz): Consider returning always an OK error code, since for the
   // callers it's important that the entry is not watched anymore. The watcher
   // is removed even if the extension returns an error.
   const int request_id = request_manager_->CreateRequest(
       UNOBSERVE_ENTRY,
       scoped_ptr<RequestManager::HandlerInterface>(
-          new operations::UnobserveEntry(
-              event_router_, file_system_info_, entry_path, callback)));
+          new operations::UnobserveEntry(event_router_,
+                                         file_system_info_,
+                                         entry_path,
+                                         recursive,
+                                         callback)));
   if (!request_id)
     callback.Run(base::File::FILE_ERROR_SECURITY);
 }
 
 const ProvidedFileSystemInfo& ProvidedFileSystem::GetFileSystemInfo() const {
   return file_system_info_;
 }
 
 RequestManager* ProvidedFileSystem::GetRequestManager() {
   return request_manager_.get();
 }
 
 ObservedEntries* ProvidedFileSystem::GetObservedEntries() {
   return &observed_entries_;
 }
 
 void ProvidedFileSystem::AddObserver(ProvidedFileSystemObserver* observer) {
   DCHECK(observer);
   observers_.AddObserver(observer);
 }
 
 void ProvidedFileSystem::RemoveObserver(ProvidedFileSystemObserver* observer) {
   DCHECK(observer);
   observers_.RemoveObserver(observer);
 }
 
 bool ProvidedFileSystem::Notify(
     const base::FilePath& observed_path,
+    bool recursive,
     ProvidedFileSystemObserver::ChangeType change_type,
-    scoped_ptr<ProvidedFileSystemObserver::ChildChanges> child_changes,
+    scoped_ptr<ProvidedFileSystemObserver::Changes> changes,
     const std::string& tag) {
-  const ObservedEntries::iterator it = observed_entries_.find(observed_path);
+  const ObservedEntryKey key(observed_path, recursive);
+  const ObservedEntries::iterator it = observed_entries_.find(key);
   if (it == observed_entries_.end())
     return false;
 
   // The tag must be provided if and only if it's explicitly supported.
   if (file_system_info_.supports_notify_tag() == tag.empty())
     return false;
 
   // The object is owned by AutoUpdated, so the reference is valid as long as
   // callbacks created with AutoUpdater::CreateCallback().
-  const ProvidedFileSystemObserver::ChildChanges& child_changes_ref =
-      *child_changes.get();
+  const ProvidedFileSystemObserver::Changes& changes_ref = *changes.get();
 
   scoped_refptr<AutoUpdater> auto_updater(
       new AutoUpdater(base::Bind(&ProvidedFileSystem::OnNotifyCompleted,
                                  weak_ptr_factory_.GetWeakPtr(),
                                  observed_path,
+                                 recursive,
                                  change_type,
-                                 base::Passed(&child_changes),
+                                 base::Passed(&changes),
                                  it->second.last_tag,
                                  tag)));
 
   FOR_EACH_OBSERVER(ProvidedFileSystemObserver,
                     observers_,
                     OnObservedEntryChanged(file_system_info_,
                                            it->second,
                                            change_type,
-                                           child_changes_ref,
+                                           changes_ref,
                                            auto_updater->CreateCallback()));
 
   return true;
 }
 
 base::WeakPtr<ProvidedFileSystemInterface> ProvidedFileSystem::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 void ProvidedFileSystem::Abort(
@@ skipping 16 matching lines @@
 void ProvidedFileSystem::OnObserveDirectoryCompleted(
     const base::FilePath& directory_path,
     bool recursive,
     const storage::AsyncFileUtil::StatusCallback& callback,
     base::File::Error result) {
   if (result != base::File::FILE_OK) {
     callback.Run(result);
     return;
   }
 
-  observed_entries_[directory_path].entry_path = directory_path;
-  observed_entries_[directory_path].recursive |= recursive;
+  const ObservedEntryKey key(directory_path, recursive);
+  const ObservedEntries::iterator it = observed_entries_.find(key);
+  if (it != observed_entries_.end()) {
+    callback.Run(base::File::FILE_OK);
+    return;
+  }
+
+  observed_entries_[key].entry_path = directory_path;
+  observed_entries_[key].recursive = recursive;
 
   FOR_EACH_OBSERVER(
       ProvidedFileSystemObserver,
       observers_,
       OnObservedEntryListChanged(file_system_info_, observed_entries_));
 
-  callback.Run(result);
+  callback.Run(base::File::FILE_OK);
 }
 
 void ProvidedFileSystem::OnNotifyCompleted(
     const base::FilePath& observed_path,
+    bool recursive,
     ProvidedFileSystemObserver::ChangeType change_type,
-    scoped_ptr<ProvidedFileSystemObserver::ChildChanges> /* child_changes */,
+    scoped_ptr<ProvidedFileSystemObserver::Changes> /* changes */,
     const std::string& last_tag,
     const std::string& tag) {
-  const ObservedEntries::iterator it = observed_entries_.find(observed_path);
+  const ObservedEntryKey key(observed_path, recursive);
+  const ObservedEntries::iterator it = observed_entries_.find(key);
   // Check if the entry is still observed.
   if (it == observed_entries_.end())
     return;
 
   // Another following notification finished earlier.
   if (it->second.last_tag != last_tag)
     return;
 
   // It's illegal to provide a tag which is not unique. As for now only an error
   // message is printed, but we may want to pass the error to the providing
   // extension. TODO(mtomasz): Consider it.
   if (!tag.empty() && tag == it->second.last_tag)
     LOG(ERROR) << "Tag specified, but same as the previous one.";
 
   it->second.last_tag = tag;
 
   FOR_EACH_OBSERVER(ProvidedFileSystemObserver,
                     observers_,
                     OnObservedEntryTagUpdated(file_system_info_, it->second));
 
   // If the observed entry is deleted, then unobserve it.
   if (change_type == ProvidedFileSystemObserver::DELETED)
-    UnobserveEntry(observed_path, base::Bind(&EmptyStatusCallback));
+    UnobserveEntry(observed_path, recursive, base::Bind(&EmptyStatusCallback));
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos