[fsp] Separate recursive and non-recursive watchers.

chrome/browser/chromeos/file_system_provider/service.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/service.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/stl_util.h"
@@ skipping 333 matching lines @@
     FOR_EACH_OBSERVER(Observer,
                       observers_,
                       OnProvidedFileSystemUnmount(file_system_info, error));
   }
 }
 
 void Service::OnObservedEntryChanged(
     const ProvidedFileSystemInfo& file_system_info,
     const ObservedEntry& observed_entry,
     ChangeType change_type,
-    const ChildChanges& child_changes,
+    const Changes& changes,
     const base::Closure& callback) {
   callback.Run();
 }
 
 void Service::OnObservedEntryTagUpdated(
     const ProvidedFileSystemInfo& file_system_info,
     const ObservedEntry& observed_entry) {
   PrefService* const pref_service = profile_->GetPrefs();
   DCHECK(pref_service);
 
   registry_->UpdateObservedEntryTag(file_system_info, observed_entry);
 }
 
 void Service::OnObservedEntryListChanged(
     const ProvidedFileSystemInfo& file_system_info,
     const ObservedEntries& observed_entries) {
   registry_->RememberFileSystem(file_system_info, observed_entries);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos