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

6 files changed, 26 insertions, 35 deletions

diff --git a/webkit/fileapi/syncable/local_file_sync_context.cc b/webkit/fileapi/syncable/local_file_sync_context.cc
index 12789c18..828a4d3 100644
--- a/webkit/fileapi/syncable/local_file_sync_context.cc
+++ b/webkit/fileapi/syncable/local_file_sync_context.cc
@@ -23,6 +23,8 @@
 #include "webkit/fileapi/syncable/syncable_file_system_util.h"
 
 using sync_file_system::FileChangeList;
+using sync_file_system::LocalFileSyncInfo;
+using sync_file_system::SyncFileMetadata;
 using sync_file_system::SyncFileType;
 
 namespace fileapi {
diff --git a/webkit/fileapi/syncable/local_file_sync_context.h b/webkit/fileapi/syncable/local_file_sync_context.h
index 2d1bf8b..9109b2b 100644
--- a/webkit/fileapi/syncable/local_file_sync_context.h
+++ b/webkit/fileapi/syncable/local_file_sync_context.h
@@ -31,13 +31,13 @@ class SingleThreadTaskRunner;
 
 namespace sync_file_system {
 class FileChange;
+struct LocalFileSyncInfo;
 }
 
 namespace fileapi {
 
 class FileSystemContext;
 class LocalFileChangeTracker;
-struct LocalFileSyncInfo;
 class LocalOriginChangeObserver;
 class SyncableFileOperationRunner;
 
@@ -50,9 +50,10 @@ class WEBKIT_STORAGE_EXPORT LocalFileSyncContext
     : public base::RefCountedThreadSafe<LocalFileSyncContext>,
       public LocalFileSyncStatus::Observer {
  public:
-  typedef base::Callback<void(SyncStatusCode status,
-                              const LocalFileSyncInfo& sync_file_info)>
-      LocalFileSyncInfoCallback;
+  typedef base::Callback<void(
+      SyncStatusCode status,
+      const sync_file_system::LocalFileSyncInfo& sync_file_info)>
+          LocalFileSyncInfoCallback;
 
   typedef base::Callback<void(fileapi::SyncStatusCode status,
                               bool has_pending_changes)>
@@ -218,7 +219,7 @@ class WEBKIT_STORAGE_EXPORT LocalFileSyncContext
       std::deque<FileSystemURL>* remaining_urls,
       const LocalFileSyncInfoCallback& callback,
       SyncStatusCode status,
-      const LocalFileSyncInfo& sync_file_info);
+      const sync_file_system::LocalFileSyncInfo& sync_file_info);
 
   // Callback routine for PrepareForSync and GetFileForLocalSync.
   void DidGetWritingStatusForSync(
diff --git a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc b/webkit/fileapi/syncable/local_file_sync_context_unittest.cc
index 32697ce..3e2b4f72 100644
--- a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc
+++ b/webkit/fileapi/syncable/local_file_sync_context_unittest.cc
@@ -36,6 +36,8 @@
 
 using sync_file_system::FileChange;
 using sync_file_system::FileChangeList;
+using sync_file_system::LocalFileSyncInfo;
+using sync_file_system::SyncFileMetadata;
 using sync_file_system::SyncFileType;
 
 namespace fileapi {
diff --git a/webkit/fileapi/syncable/sync_callbacks.h b/webkit/fileapi/syncable/sync_callbacks.h
index d8010d6..e147a86 100644
--- a/webkit/fileapi/syncable/sync_callbacks.h
+++ b/webkit/fileapi/syncable/sync_callbacks.h
@@ -10,12 +10,14 @@
 #include "webkit/fileapi/syncable/sync_file_status.h"
 #include "webkit/fileapi/syncable/sync_status_code.h"
 
+namespace sync_file_system {
+class SyncFileMetadata;
+}
+
 // TODO(calvinlo): Move to sync_file_system namespace. http://crbug/174870.
 namespace fileapi {
 
 class FileSystemURL;
-class SyncFileMetadata;
-class ConflictFileInfo;
 
 typedef base::Callback<void(SyncStatusCode status)>
     SyncStatusCallback;
@@ -24,18 +26,15 @@ typedef base::Callback<void(SyncStatusCode status,
                             const FileSystemURL& url)>
     SyncFileCallback;
 
-typedef base::Callback<void(SyncStatusCode status,
-                            const SyncFileMetadata& metadata)>
-    SyncFileMetadataCallback;
+typedef base::Callback<void(
+    SyncStatusCode status,
+    const sync_file_system::SyncFileMetadata& metadata)>
+        SyncFileMetadataCallback;
 
 typedef base::Callback<void(fileapi::SyncStatusCode status,
                             const fileapi::FileSystemURLSet& urls)>
     SyncFileSetCallback;
 
-typedef base::Callback<void(fileapi::SyncStatusCode status,
-                            const fileapi::ConflictFileInfo& conflict_info)>
-    ConflictFileInfoCallback;
-
 typedef base::Callback<void(SyncStatusCode status,
                             sync_file_system::SyncFileStatus sync_file_status)>
     SyncFileStatusCallback;
diff --git a/webkit/fileapi/syncable/sync_file_metadata.cc b/webkit/fileapi/syncable/sync_file_metadata.cc
index ae32e0d..c613c8e 100644
--- a/webkit/fileapi/syncable/sync_file_metadata.cc
+++ b/webkit/fileapi/syncable/sync_file_metadata.cc
@@ -6,7 +6,7 @@
 
 using sync_file_system::SyncFileType;
 
-namespace fileapi {
+namespace sync_file_system {
 
 SyncFileMetadata::SyncFileMetadata()
     : file_type(sync_file_system::SYNC_FILE_TYPE_UNKNOWN),
@@ -30,10 +30,7 @@ bool SyncFileMetadata::operator==(const SyncFileMetadata& that) const {
          last_modified == that.last_modified;
 }
 
-ConflictFileInfo::ConflictFileInfo() {}
-ConflictFileInfo::~ConflictFileInfo() {}
-
 LocalFileSyncInfo::LocalFileSyncInfo() {}
 LocalFileSyncInfo::~LocalFileSyncInfo() {}
 
-}  // namespace fileapi
+}  // namespace sync_file_system
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_