Migrated sync_file_type and file_change from namespace fileapi to sync_file_system.

webkit/fileapi/syncable/local_file_change_tracker.h

 // Copyright (c) 2012 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 WEBKIT_FILEAPI_SYNCABLE_LOCAL_FILE_CHANGE_TRACKER_H_
 #define WEBKIT_FILEAPI_SYNCABLE_LOCAL_FILE_CHANGE_TRACKER_H_
 
 #include <deque>
 #include <map>
 #include <string>
@@ skipping 47 matching lines @@
   virtual void OnRemoveDirectory(const FileSystemURL& url) OVERRIDE;
 
   // Retrieves an array of |url| which have more than one pending changes.
   // If |max_urls| is non-zero (recommended in production code) this
   // returns URLs up to the number from the ones that have smallest
   // change_seq numbers (i.e. older changes).
   void GetNextChangedURLs(std::deque<FileSystemURL>* urls, int max_urls);
 
   // Returns all changes recorded for the given |url|.
   // This should be called after writing is disabled.
-  void GetChangesForURL(const FileSystemURL& url, FileChangeList* changes);
+  void GetChangesForURL(const FileSystemURL& url,
+                        sync_file_system::FileChangeList* changes);
 
   // Clears the pending changes recorded in this tracker for |url|.
   void ClearChangesForURL(const FileSystemURL& url);
 
   // Called by FileSyncService at the startup time to restore last dirty changes
   // left after the last shutdown (if any).
   SyncStatusCode Initialize(FileSystemContext* file_system_context);
 
   // This method is (exceptionally) thread-safe.
   int64 num_changes() const {
     base::AutoLock lock(num_changes_lock_);
     return num_changes_;
   }
 
   void UpdateNumChanges();
 
  private:
   class TrackerDB;
   friend class CannedSyncableFileSystem;
   friend class LocalFileChangeTrackerTest;
   friend class LocalFileSyncContext;
   friend class SyncableFileSystemTest;
 
   struct ChangeInfo {
     ChangeInfo();
     ~ChangeInfo();
-    FileChangeList change_list;
+    sync_file_system::FileChangeList change_list;
     int64 change_seq;
   };
 
   typedef std::map<FileSystemURL, ChangeInfo, FileSystemURL::Comparator>
       FileChangeMap;
   typedef std::map<int64, FileSystemURL> ChangeSeqMap;
 
   // This does mostly same as calling GetNextChangedURLs with max_url=0
   // except that it returns urls in set rather than in deque.
   // Used only in testings.
   void GetAllChangedURLs(FileSystemURLSet* urls);
 
   // Used only in testings.
   void DropAllChanges();
 
   // Database related methods.
   SyncStatusCode MarkDirtyOnDatabase(const FileSystemURL& url);
   SyncStatusCode ClearDirtyOnDatabase(const FileSystemURL& url);
 
   SyncStatusCode CollectLastDirtyChanges(
       FileSystemContext* file_system_context);
-  void RecordChange(const FileSystemURL& url, const FileChange& change);
+  void RecordChange(const FileSystemURL& url,
+                    const sync_file_system::FileChange& change);
 
   bool initialized_;
 
   scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
 
   FileChangeMap changes_;
   ChangeSeqMap change_seqs_;
 
   scoped_ptr<TrackerDB> tracker_db_;
 
   // Change sequence number. Briefly gives a hint about the order of changes,
   // but they are updated when a new change comes on the same file (as
   // well as Drive's changestamps).
   int64 current_change_seq_;
 
   // This can be accessed on any threads (with num_changes_lock_).
   int64 num_changes_;
   mutable base::Lock num_changes_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalFileChangeTracker);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_SYNCABLE_LOCAL_FILE_CHANGE_TRACKER_H_