Migrated sync_file_metadata from fileapi to sync_file_system

BUG=174870


Review URL: https://chromiumcodereview.appspot.com/12330069

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184385 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 16 deletions

diff --git a/webkit/fileapi/syncable/sync_file_metadata.h b/webkit/fileapi/syncable/sync_file_metadata.h
index b4c3f69..63361d3 100644
--- a/webkit/fileapi/syncable/sync_file_metadata.h
+++ b/webkit/fileapi/syncable/sync_file_metadata.h
@@ -11,43 +11,33 @@
 #include "webkit/fileapi/syncable/file_change.h"
 #include "webkit/storage/webkit_storage_export.h"
 
-namespace fileapi {
+namespace sync_file_system {
 
 class WEBKIT_STORAGE_EXPORT SyncFileMetadata {
  public:
   SyncFileMetadata();
-  SyncFileMetadata(sync_file_system::SyncFileType file_type,
+  SyncFileMetadata(SyncFileType file_type,
                    int64 size,
                    const base::Time& last_modified);
   ~SyncFileMetadata();
 
-  sync_file_system::SyncFileType file_type;
+  SyncFileType file_type;
   int64 size;
   base::Time last_modified;
 
   bool operator==(const SyncFileMetadata& that) const;
 };
 
-class WEBKIT_STORAGE_EXPORT ConflictFileInfo {
- public:
-  ConflictFileInfo();
-  ~ConflictFileInfo();
-
-  FileSystemURL url;
-  SyncFileMetadata local_metadata;
-  SyncFileMetadata remote_metadata;
-};
-
 struct WEBKIT_STORAGE_EXPORT LocalFileSyncInfo {
   LocalFileSyncInfo();
   ~LocalFileSyncInfo();
 
-  FileSystemURL url;
+  fileapi::FileSystemURL url;
   base::FilePath local_file_path;
   SyncFileMetadata metadata;
-  sync_file_system::FileChangeList changes;
+  FileChangeList changes;
 };
 
-}  // namespace fileapi
+}  // namespace sync_file_system
 
 #endif  // WEBKIT_FILEAPI_SYNCABLE_SYNC_FILE_METADATA_H_