[fsp] Separate recursive and non-recursive watchers.

chrome/browser/chromeos/file_system_provider/service.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_SERVICE_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 115 matching lines @@
       extensions::UnloadedExtensionInfo::Reason reason) override;
   virtual void OnExtensionLoaded(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension) override;
 
   // ProvidedFileSystemInterface::Observer overrides.
   virtual void OnObservedEntryChanged(
       const ProvidedFileSystemInfo& file_system_info,
       const ObservedEntry& observed_entry,
       ProvidedFileSystemObserver::ChangeType change_type,
-      const ProvidedFileSystemObserver::ChildChanges& child_changes,
+      const ProvidedFileSystemObserver::Changes& changes,
       const base::Closure& callback) override;
   virtual void OnObservedEntryTagUpdated(
       const ProvidedFileSystemInfo& file_system_info,
       const ObservedEntry& observed_entry) override;
   virtual void OnObservedEntryListChanged(
       const ProvidedFileSystemInfo& file_system_info,
       const ObservedEntries& observed_entries) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(FileSystemProviderServiceTest, RememberFileSystem);
@@ skipping 35 matching lines @@
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<Service> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace file_system_provider
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_SERVICE_H_