Move storage-related files from webkit/ to new top-level directory storage/

chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h

 // Copyright 2013 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_SYNC_FILE_SYSTEM_DRIVE_BACKEND_V1_DRIVE_FILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_V1_DRIVE_FILE_SYNC_SERVICE_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 88 matching lines @@
   virtual LocalChangeProcessor* GetLocalChangeProcessor() OVERRIDE;
   virtual RemoteServiceState GetCurrentState() const OVERRIDE;
   virtual void GetOriginStatusMap(const StatusMapCallback& callback) OVERRIDE;
   virtual void DumpFiles(const GURL& origin,
                          const ListCallback& callback) OVERRIDE;
   virtual void DumpDatabase(const ListCallback& callback) OVERRIDE;
   virtual void SetSyncEnabled(bool enabled) OVERRIDE;
   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;
   virtual void OnNetworkConnected() OVERRIDE;
 
   // drive::DriveNotificationObserver implementation.
   virtual void OnNotificationReceived() OVERRIDE;
   virtual void OnPushNotificationEnabled(bool enabled) OVERRIDE;
 
   // SyncTaskManager::Client overrides.
@@ skipping 58 matching lines @@
   void DoDisableOrigin(
       const GURL& origin,
       const SyncStatusCallback& callback);
   void DoUninstallOrigin(
       const GURL& origin,
       UninstallFlag flag,
       const SyncStatusCallback& callback);
   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();
 
   void StartBatchSync(const SyncStatusCallback& callback);
   void DidGetDriveDirectoryForOrigin(const GURL& origin,
                                      const SyncStatusCallback& callback,
                                      SyncStatusCode status,
                                      const std::string& resource_id);
   void DidUninstallOrigin(const GURL& origin,
                           const SyncStatusCallback& callback,
@@ skipping 30 matching lines @@
       SyncFileType file_type);
   bool AppendRemoteChangeInternal(
       const GURL& origin,
       const base::FilePath& path,
       bool is_deleted,
       const std::string& resource_id,
       int64 changestamp,
       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.
   SyncStatusCode GDataErrorCodeToSyncStatusCodeWrapper(
       google_apis::GDataErrorCode error);
 
   base::FilePath temporary_file_dir_;
 
   // May start batch sync or incremental sync.
   // This posts either one of following tasks:
   // - StartBatchSyncForOrigin() if it has any pending batch sync origins, or
   // - FetchChangesForIncrementalSync() otherwise.
   //
   // These two methods are called only from this method.
   void MaybeStartFetchChanges();
 
   void FetchChangesForIncrementalSync(const SyncStatusCallback& callback);
   void DidFetchChangesForIncrementalSync(
       const SyncStatusCallback& callback,
       bool has_new_changes,
       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);
 
   void EnsureSyncRootDirectory(const ResourceIdCallback& callback);
   void DidEnsureSyncRoot(const ResourceIdCallback& callback,
                          google_apis::GDataErrorCode error,
                          const std::string& sync_root_resource_id);
   void EnsureOriginRootDirectory(const GURL& origin,
                                  const ResourceIdCallback& callback);
@@ skipping 61 matching lines @@
   ConflictResolutionResolver conflict_resolution_resolver_;
 
   OriginOperationQueue pending_origin_operations_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveFileSyncService);
 };
 
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_V1_DRIVE_FILE_SYNC_SERVICE_H_