[fsp] Pass proper data to Notify().

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 430 matching lines @@
 }
 
 void ProvidedFileSystem::RemoveObserver(ProvidedFileSystemObserver* observer) {
   DCHECK(observer);
   observers_.RemoveObserver(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())
     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();
+
   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)));
 
   FOR_EACH_OBSERVER(ProvidedFileSystemObserver,
                     observers_,
                     OnObservedEntryChanged(file_system_info_,
                                            observed_path,
                                            change_type,
-                                           child_changes,
+                                           child_changes_ref,
                                            auto_updater->CreateCallback()));
 
   return true;
 }
 
 base::WeakPtr<ProvidedFileSystemInterface> ProvidedFileSystem::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 void ProvidedFileSystem::Abort(
@@ skipping 29 matching lines @@
   FOR_EACH_OBSERVER(ProvidedFileSystemObserver,
                     observers_,
                     OnObservedEntryListChanged(file_system_info_));
 
   callback.Run(result);
 }
 
 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);
   // 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;
@@ skipping 11 matching lines @@
       observers_,
       OnObservedEntryTagUpdated(file_system_info_, observed_path));
 
   // If the observed entry is deleted, then unobserve it.
   if (change_type == ProvidedFileSystemObserver::DELETED)
     UnobserveEntry(observed_path, base::Bind(&EmptyStatusCallback));
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos