[fsp] Separate recursive and non-recursive watchers.

chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.cc

 // Copyright 2013 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_system_provider/file_system_provider_api.h"
 
 #include <string>
 #include <vector>
 
 #include "base/debug/trace_event.h"
@@ skipping 10 matching lines @@
 using chromeos::file_system_provider::MountOptions;
 using chromeos::file_system_provider::ProvidedFileSystemInfo;
 using chromeos::file_system_provider::ProvidedFileSystemInterface;
 using chromeos::file_system_provider::ProvidedFileSystemObserver;
 using chromeos::file_system_provider::RequestValue;
 using chromeos::file_system_provider::Service;
 
 namespace extensions {
 namespace {
 
-typedef std::vector<linked_ptr<api::file_system_provider::ChildChange>>
-    IDLChildChanges;
+typedef std::vector<linked_ptr<api::file_system_provider::Change>> IDLChanges;
 
 const char kNotifyFailedErrorMessage[] =
     "Sending a response for the request failed.";
 const char kInvalidNotificationErrorMessage[] = "The notification is invalid.";
 
 // Converts the change type from the IDL type to a native type. |changed_type|
 // must be specified (not CHANGE_TYPE_NONE).
 ProvidedFileSystemObserver::ChangeType ParseChangeType(
     const api::file_system_provider::ChangeType& change_type) {
   switch (change_type) {
     case api::file_system_provider::CHANGE_TYPE_CHANGED:
       return ProvidedFileSystemObserver::CHANGED;
     case api::file_system_provider::CHANGE_TYPE_DELETED:
       return ProvidedFileSystemObserver::DELETED;
     default:
       break;
   }
   NOTREACHED();
   return ProvidedFileSystemObserver::CHANGED;
 }
 
-// Convert the child change from the IDL type to a native type. The reason IDL
-// types are not used is since they are imperfect, eg. paths are stored as
-// strings.
-ProvidedFileSystemObserver::ChildChange ParseChildChange(
-    const api::file_system_provider::ChildChange& child_change) {
-  ProvidedFileSystemObserver::ChildChange result;
+// Convert the change from the IDL type to a native type. The reason IDL types
+// are not used is since they are imperfect, eg. paths are stored as strings.
+ProvidedFileSystemObserver::Change ParseChange(
+    const api::file_system_provider::Change& child_change) {

[hirono, 2014/10/24 06:58:43]

nit: child_change -> change

[mtomasz, 2014/10/24 09:50:24]

Done.

+  ProvidedFileSystemObserver::Change result;
   result.entry_path = base::FilePath::FromUTF8Unsafe(child_change.entry_path);
   result.change_type = ParseChangeType(child_change.change_type);
   return result;
 }
 
 // Converts a list of child changes from the IDL type to a native type.
-scoped_ptr<ProvidedFileSystemObserver::ChildChanges> ParseChildChanges(
-    const IDLChildChanges& child_changes) {
-  scoped_ptr<ProvidedFileSystemObserver::ChildChanges> results(
-      new ProvidedFileSystemObserver::ChildChanges);
-  for (IDLChildChanges::const_iterator it = child_changes.begin();
+scoped_ptr<ProvidedFileSystemObserver::Changes> ParseChanges(
+    const IDLChanges& child_changes) {

[hirono, 2014/10/24 06:58:42]

nit: child_changes -> changes

[mtomasz, 2014/10/24 09:50:24]

Done.

+  scoped_ptr<ProvidedFileSystemObserver::Changes> results(
+      new ProvidedFileSystemObserver::Changes);
+  for (IDLChanges::const_iterator it = child_changes.begin();

[hirono, 2014/10/24 06:58:43]

nit: 
You can use "for (auto it : changes)".
But up to you.

[mtomasz, 2014/10/24 09:50:24]

Right! Done.

        it != child_changes.end();
        ++it) {
-    results->push_back(ParseChildChange(*it->get()));
+    results->push_back(ParseChange(*it->get()));
   }
   return results;
 }
 
 }  // namespace
 
 bool FileSystemProviderMountFunction::RunSync() {
   using api::file_system_provider::Mount::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
@@ skipping 104 matching lines @@
                                      params->options.file_system_id);
   if (!file_system) {
     base::ListValue* const result = new base::ListValue();
     result->Append(CreateError(kNotFoundErrorName, kNotifyFailedErrorMessage));
     SetResult(result);
     return true;
   }
 
   if (!file_system->Notify(
           base::FilePath::FromUTF8Unsafe(params->options.observed_path),
+          params->options.recursive,
           ParseChangeType(params->options.change_type),
-          params->options.child_changes.get()
-              ? ParseChildChanges(*params->options.child_changes.get())
-              : make_scoped_ptr(new ProvidedFileSystemObserver::ChildChanges),
+          params->options.changes.get()
+              ? ParseChanges(*params->options.changes.get())
+              : make_scoped_ptr(new ProvidedFileSystemObserver::Changes),
           params->options.tag.get() ? *params->options.tag.get() : "")) {
     base::ListValue* const result = new base::ListValue();
     result->Append(
         CreateError(kSecurityErrorName, kInvalidNotificationErrorMessage));
     SetResult(result);
     return true;
   }
 
   base::ListValue* const result = new base::ListValue();
   SetResult(result);
@@ skipping 64 matching lines @@
   using api::file_system_provider_internal::OperationRequestedError::Params;
   scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   const base::File::Error error = ProviderErrorToFileError(params->error);
   RejectRequest(RequestValue::CreateForOperationError(params.Pass()), error);
   return true;
 }
 
 }  // namespace extensions