Index: chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h |
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h |
index c53e307f11a9fe0507bbb40203369a7e6d4a69fe..b49fbb0f4d265d32a22f6556b78e0cbd572ca6b2 100644 |
--- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h |
+++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h |
@@ -106,12 +106,11 @@ class DriveFileSyncService : public RemoteFileSyncService, |
virtual void PromoteDemotedChanges(const base::Closure& callback) OVERRIDE; |
// LocalChangeProcessor overrides. |
- virtual void ApplyLocalChange( |
- const FileChange& change, |
- const base::FilePath& local_file_path, |
- const SyncFileMetadata& local_file_metadata, |
- const fileapi::FileSystemURL& url, |
- const SyncStatusCallback& callback) OVERRIDE; |
+ virtual void ApplyLocalChange(const FileChange& change, |
+ const base::FilePath& local_file_path, |
+ const SyncFileMetadata& local_file_metadata, |
+ const storage::FileSystemURL& url, |
+ const SyncStatusCallback& callback) OVERRIDE; |
// DriveFileSyncClientObserver overrides. |
virtual void OnAuthenticated() OVERRIDE; |
@@ -190,12 +189,11 @@ class DriveFileSyncService : public RemoteFileSyncService, |
void DoProcessRemoteChange( |
const SyncFileCallback& sync_callback, |
const SyncStatusCallback& completion_callback); |
- void DoApplyLocalChange( |
- const FileChange& change, |
- const base::FilePath& local_file_path, |
- const SyncFileMetadata& local_file_metadata, |
- const fileapi::FileSystemURL& url, |
- const SyncStatusCallback& callback); |
+ void DoApplyLocalChange(const FileChange& change, |
+ const base::FilePath& local_file_path, |
+ const SyncFileMetadata& local_file_metadata, |
+ const storage::FileSystemURL& url, |
+ const SyncStatusCallback& callback); |
void UpdateRegisteredOrigins(); |
@@ -246,17 +244,15 @@ class DriveFileSyncService : public RemoteFileSyncService, |
const std::string& remote_file_md5, |
const base::Time& updated_time, |
SyncFileType file_type); |
- void RemoveRemoteChange(const fileapi::FileSystemURL& url); |
+ void RemoveRemoteChange(const storage::FileSystemURL& url); |
// TODO(kinuko,tzik): Move this out of DriveFileSyncService. |
- void MarkConflict( |
- const fileapi::FileSystemURL& url, |
- DriveMetadata* drive_metadata, |
- const SyncStatusCallback& callback); |
- void NotifyConflict( |
- const fileapi::FileSystemURL& url, |
- const SyncStatusCallback& callback, |
- SyncStatusCode status); |
+ void MarkConflict(const storage::FileSystemURL& url, |
+ DriveMetadata* drive_metadata, |
+ const SyncStatusCallback& callback); |
+ void NotifyConflict(const storage::FileSystemURL& url, |
+ const SyncStatusCallback& callback, |
+ SyncStatusCode status); |
// A wrapper implementation to GDataErrorCodeToSyncStatusCode which returns |
// authentication error if the user is not signed in. |
@@ -280,7 +276,7 @@ class DriveFileSyncService : public RemoteFileSyncService, |
google_apis::GDataErrorCode error, |
scoped_ptr<google_apis::ResourceList> changes); |
bool GetOriginForEntry(const google_apis::ResourceEntry& entry, GURL* origin); |
- void NotifyObserversFileStatusChanged(const fileapi::FileSystemURL& url, |
+ void NotifyObserversFileStatusChanged(const storage::FileSystemURL& url, |
SyncFileStatus sync_status, |
SyncAction action_taken, |
SyncDirection direction); |