[fsp] Pass proper data to Notify().

This patch passes proper data instead of fake one to Notify(). Also, child
changes are now passed as a scoped_ptr and a reference to avoid unnecessary
copies.

Note, that end to end browser tests will come once notifications are wired to
chrome.fileManagerPrivate.

TEST=Tested manually.
BUG=248427

Review URL: https://codereview.chromium.org/656393002

Cr-Commit-Position: refs/heads/master@{#300062}

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

@@ -21,16 +21,60 @@
 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;
+
 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;
+  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();
+       it != child_changes.end();
+       ++it) {
+    results->push_back(ParseChildChange(*it->get()));
+  }
+  return results;
+}
+
 }  // namespace
 
 bool FileSystemProviderMountFunction::RunSync() {
@@ -149,13 +193,13 @@ bool FileSystemProviderNotifyFunction::RunSync() {
     return true;
   }
 
-  // TODO(mtomasz): Pass real data to Notify() instead of fake ones.
   if (!file_system->Notify(
           base::FilePath::FromUTF8Unsafe(params->options.observed_path),
-          chromeos::file_system_provider::ProvidedFileSystemObserver::CHANGED,
-          chromeos::file_system_provider::ProvidedFileSystemObserver::
-              ChildChanges(),
-          "todo-tag")) {
+          ParseChangeType(params->options.change_type),
+          params->options.child_changes.get()
+              ? ParseChildChanges(*params->options.child_changes.get())
+              : make_scoped_ptr(new ProvidedFileSystemObserver::ChildChanges),
+          params->options.tag.get() ? *params->options.tag.get() : "")) {
     base::ListValue* const result = new base::ListValue();
     result->Append(
         CreateError(kSecurityErrorName, kInvalidNotificationErrorMessage));

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

@@ -131,4 +131,7 @@ IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, Thumbnail) {
       << message_;
 }
 
+// TODO(mtomasz): Add a test for Notify() once it's wired to
+// chrome.fileManagerPrivate.
+
 }  // namespace extensions

chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc

@@ -367,7 +367,7 @@ void FakeProvidedFileSystem::RemoveObserver(
 bool FakeProvidedFileSystem::Notify(
     const base::FilePath& observed_path,
     ProvidedFileSystemObserver::ChangeType change_type,
-    const ProvidedFileSystemObserver::ChildChanges& child_changes,
+    scoped_ptr<ProvidedFileSystemObserver::ChildChanges> child_changes,
     const std::string& tag) {
   NOTREACHED();
   return false;

chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h

@@ -139,7 +139,7 @@ class FakeProvidedFileSystem : public ProvidedFileSystemInterface {
   virtual bool Notify(
       const base::FilePath& observed_path,
       ProvidedFileSystemObserver::ChangeType change_type,
-      const ProvidedFileSystemObserver::ChildChanges& child_changes,
+      scoped_ptr<ProvidedFileSystemObserver::ChildChanges> child_changes,
       const std::string& tag) override;
   virtual base::WeakPtr<ProvidedFileSystemInterface> GetWeakPtr() override;
 

chrome/browser/chromeos/file_system_provider/provided_file_system.cc

@@ -448,7 +448,7 @@ void ProvidedFileSystem::RemoveObserver(ProvidedFileSystemObserver* observer) {
 bool ProvidedFileSystem::Notify(
     const base::FilePath& observed_path,
     ProvidedFileSystemObserver::ChangeType change_type,
-    const ProvidedFileSystemObserver::ChildChanges& child_changes,
+    scoped_ptr<ProvidedFileSystemObserver::ChildChanges> child_changes,
     const std::string& tag) {
   const ObservedEntries::iterator it = observed_entries_.find(observed_path);
   if (it == observed_entries_.end())
@@ -458,11 +458,17 @@ bool ProvidedFileSystem::Notify(
   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();
+
   scoped_refptr<AutoUpdater> auto_updater(
       new AutoUpdater(base::Bind(&ProvidedFileSystem::OnNotifyCompleted,
                                  weak_ptr_factory_.GetWeakPtr(),
                                  observed_path,
                                  change_type,
+                                 base::Passed(&child_changes),
                                  it->second.last_tag,
                                  tag)));
 
@@ -471,7 +477,7 @@ bool ProvidedFileSystem::Notify(
                     OnObservedEntryChanged(file_system_info_,
                                            observed_path,
                                            change_type,
-                                           child_changes,
+                                           child_changes_ref,
                                            auto_updater->CreateCallback()));
 
   return true;
@@ -521,6 +527,7 @@ void ProvidedFileSystem::OnObserveDirectoryCompleted(
 void ProvidedFileSystem::OnNotifyCompleted(
     const base::FilePath& observed_path,
     ProvidedFileSystemObserver::ChangeType change_type,
+    scoped_ptr<ProvidedFileSystemObserver::ChildChanges> /* child_changes */,
     const std::string& last_tag,
     const std::string& tag) {
   const ObservedEntries::iterator it = observed_entries_.find(observed_path);

chrome/browser/chromeos/file_system_provider/provided_file_system.h

@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
@@ -150,7 +151,7 @@ class ProvidedFileSystem : public ProvidedFileSystemInterface {
   virtual bool Notify(
       const base::FilePath& observed_path,
       ProvidedFileSystemObserver::ChangeType change_type,
-      const ProvidedFileSystemObserver::ChildChanges& child_changes,
+      scoped_ptr<ProvidedFileSystemObserver::ChildChanges> child_changes,
       const std::string& tag) override;
   virtual base::WeakPtr<ProvidedFileSystemInterface> GetWeakPtr() override;
 
@@ -170,10 +171,12 @@ class ProvidedFileSystem : public ProvidedFileSystemInterface {
 
   // Called when all observers finished handling the change notification. It
   // updates the tag from |last_tag| to |tag| for the entry at |observed_path|.
-  void OnNotifyCompleted(const base::FilePath& observed_path,
-                         ProvidedFileSystemObserver::ChangeType change_type,
-                         const std::string& last_tag,
-                         const std::string& tag);
+  void OnNotifyCompleted(
+      const base::FilePath& observed_path,
+      ProvidedFileSystemObserver::ChangeType change_type,
+      scoped_ptr<ProvidedFileSystemObserver::ChildChanges> child_changes,
+      const std::string& last_tag,
+      const std::string& tag);
 
   Profile* profile_;                       // Not owned.
   extensions::EventRouter* event_router_;  // Not owned. May be NULL.

chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h

@@ -207,7 +207,7 @@ class ProvidedFileSystemInterface {
   virtual bool Notify(
       const base::FilePath& observed_path,
       ProvidedFileSystemObserver::ChangeType change_type,
-      const ProvidedFileSystemObserver::ChildChanges& child_changes,
+      scoped_ptr<ProvidedFileSystemObserver::ChildChanges> child_changes,
       const std::string& tag) = 0;
 
   // Returns a provided file system info for this file system.

chrome/browser/chromeos/file_system_provider/provided_file_system_observer.h

@@ -51,7 +51,8 @@ class ProvidedFileSystemObserver {
   // Called when an observed entry is changed, including removals. |callback|
   // *must* be called after the entry change is handled. Once all observers
   // call the callback, the tag will be updated and OnObservedEntryTagUpdated
-  // called.
+  // called. The reference to |child_changes| is valid at least as long as
+  // |callback|.
   virtual void OnObservedEntryChanged(
       const ProvidedFileSystemInfo& file_system_info,
       const base::FilePath& observed_path,

chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc

@@ -539,12 +539,11 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, Notify) {
     // Notify about a change.
     const ProvidedFileSystemObserver::ChangeType change_type =
         ProvidedFileSystemObserver::CHANGED;
-    const ProvidedFileSystemObserver::ChildChanges child_changes;
     const std::string tag = "hello-world";
     EXPECT_TRUE(provided_file_system_->Notify(
         base::FilePath::FromUTF8Unsafe(kDirectoryPath),
         change_type,
-        child_changes,
+        make_scoped_ptr(new ProvidedFileSystemObserver::ChildChanges),
         tag));
 
     // Verify the observer event.
@@ -582,7 +581,7 @@ TEST_F(FileSystemProviderProvidedFileSystemTest, Notify) {
     EXPECT_TRUE(provided_file_system_->Notify(
         base::FilePath::FromUTF8Unsafe(kDirectoryPath),
         change_type,
-        child_changes,
+        make_scoped_ptr(new ProvidedFileSystemObserver::ChildChanges),
         tag));
     base::RunLoop().RunUntilIdle();