[SyncFileSystem] Separate out ApplyLocalChange from DriveFileSyncService.

chrome/browser/sync_file_system/drive_file_sync_service.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 CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
 
 #include <deque>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/google_apis/drive_notification_observer.h"
 #include "chrome/browser/sync_file_system/drive/api_util_interface.h"
 #include "chrome/browser/sync_file_system/drive_metadata_store.h"
 #include "chrome/browser/sync_file_system/local_change_processor.h"
 #include "chrome/browser/sync_file_system/local_sync_operation_resolver.h"
 #include "chrome/browser/sync_file_system/remote_change_handler.h"
 #include "chrome/browser/sync_file_system/remote_file_sync_service.h"
+#include "chrome/browser/sync_file_system/sync_file_system.pb.h"
 #include "webkit/fileapi/syncable/file_change.h"
 #include "webkit/fileapi/syncable/sync_action.h"
 #include "webkit/fileapi/syncable/sync_callbacks.h"
 #include "webkit/fileapi/syncable/sync_direction.h"
 #include "webkit/fileapi/syncable/sync_status_code.h"
 
 class ExtensionService;
 
 namespace google_apis {
 class ResourceList;
 }
 
 namespace tracked_objects {
 class Location;
 }
 
 namespace sync_file_system {
 
+namespace drive {
+class LocalChangeProcessorDelegate;
+}
+
 class DriveFileSyncTaskManager;
 
 // Maintains remote file changes.
 // Owned by SyncFileSystemService (which is a per-profile object).
 class DriveFileSyncService : public RemoteFileSyncService,
                              public LocalChangeProcessor,
                              public drive::APIUtilObserver,
                              public base::NonThreadSafe,
                              public base::SupportsWeakPtr<DriveFileSyncService>,
                              public google_apis::DriveNotificationObserver {
  public:
+  enum ConflictResolutionResult {
+    CONFLICT_RESOLUTION_MARK_CONFLICT,
+    CONFLICT_RESOLUTION_LOCAL_WIN,
+    CONFLICT_RESOLUTION_REMOTE_WIN,
+  };
+
   typedef base::Callback<void(const SyncStatusCallback& callback)> Task;
 
   static const char kServiceName[];
   static ConflictResolutionPolicy kDefaultPolicy;
 
   virtual ~DriveFileSyncService();
 
   // Creates DriveFileSyncService.
   static scoped_ptr<DriveFileSyncService> Create(Profile* profile);
 
@@ skipping 56 matching lines @@
   virtual void OnNotificationReceived() OVERRIDE;
   virtual void OnPushNotificationEnabled(bool enabled) OVERRIDE;
 
   // Called from DriveFileSyncTaskManager.
   // TODO: factor out as an interface.
   void MaybeScheduleNextTask();
   void NotifyLastOperationStatus(
       SyncStatusCode sync_status,
       google_apis::GDataErrorCode gdata_error);
 
+  static std::string PathToTitle(const base::FilePath& path);
+  static base::FilePath TitleToPath(const std::string& title);
+  static DriveMetadata::ResourceType SyncFileTypeToDriveMetadataResourceType(
+      SyncFileType file_type);
+
  private:
   friend class DriveFileSyncTaskManager;
+  friend class drive::LocalChangeProcessorDelegate;
+
   friend class DriveFileSyncServiceMockTest;
   friend class DriveFileSyncServiceSyncTest;
   struct ApplyLocalChangeParam;
   struct ProcessRemoteChangeParam;
 
   typedef base::Callback<void(const base::Time& time,
                               SyncFileType remote_file_type,
                               SyncStatusCode status)> UpdatedTimeCallback;
   typedef base::Callback<
       void(SyncStatusCode status,
@@ skipping 41 matching lines @@
       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);
 
   // Local synchronization related methods.
-  // Resolves LocalSync operation type. If non-null |param| is given
-  // the method also populates param->has_drive_metadata and
-  // param->drive_metadata fields.
-  void ApplyLocalChangeInternal(
-      scoped_ptr<ApplyLocalChangeParam> param,
-      SyncStatusCode status,
-      const std::string& resource_id);
-  void DidDeleteForResolveToLocalForLocalSync(
-      const std::string& origin_resource_id,
-      const base::FilePath& local_file_path,
-      const fileapi::FileSystemURL& url,
-      scoped_ptr<ApplyLocalChangeParam> param,
-      google_apis::GDataErrorCode error);
-  void DidApplyLocalChange(
-      scoped_ptr<ApplyLocalChangeParam> param,
-      const google_apis::GDataErrorCode error,
-      SyncStatusCode status);
-  void DidResolveConflictToRemoteChange(
-      scoped_ptr<ApplyLocalChangeParam> param,
-      SyncStatusCode status);
-  void DidUploadNewFileForLocalSync(
-      scoped_ptr<ApplyLocalChangeParam> param,
-      google_apis::GDataErrorCode error,
-      const std::string& resource_id,
-      const std::string& file_md5);
-  void DidCreateDirectoryForLocalSync(
-      scoped_ptr<ApplyLocalChangeParam> param,
-      google_apis::GDataErrorCode error,
-      const std::string& resource_id);
-  void DidUploadExistingFileForLocalSync(
-      scoped_ptr<ApplyLocalChangeParam> param,
-      google_apis::GDataErrorCode error,
-      const std::string& resource_id,
-      const std::string& file_md5);
-  void DidDeleteFileForLocalSync(
-      scoped_ptr<ApplyLocalChangeParam> param,
-      google_apis::GDataErrorCode error);
-  void HandleConflictForLocalSync(
-      scoped_ptr<ApplyLocalChangeParam> param);
-  void ResolveConflictForLocalSync(
-      scoped_ptr<ApplyLocalChangeParam> param,
-      const base::Time& remote_updated_time,
+  ConflictResolutionResult ResolveConflictForLocalSync(
+      SyncFileType local_file_type,
+      const base::Time& local_update_time,
       SyncFileType remote_file_type,
-      SyncStatusCode status);
-  void StartOverLocalSync(
-      scoped_ptr<ApplyLocalChangeParam> param,
-      SyncStatusCode status);
-  void ResolveConflictToRemoteForLocalSync(
-      scoped_ptr<ApplyLocalChangeParam> param,
-      SyncFileType remote_file_type);
-  void DidEnsureOriginRootForUploadNewFile(
-      scoped_ptr<ApplyLocalChangeParam> param,
-      SyncStatusCode status,
-      const std::string& parent_resource_id);
+      const base::Time& remote_update_time);
+  void DidApplyLocalChange(const SyncStatusCallback& callback,
+                           SyncStatusCode status);
 
   void UpdateRegisteredOrigins();
 
   void StartBatchSync(const SyncStatusCallback& callback);
   void GetDriveDirectoryForOrigin(const GURL& origin,
                                   const SyncStatusCallback& callback,
                                   const std::string& sync_root_resource_id);
   void DidGetDriveDirectoryForOrigin(const GURL& origin,
                                      const SyncStatusCallback& callback,
                                      SyncStatusCode status,
@@ skipping 146 matching lines @@
   // removed.
   std::string sync_root_resource_id();
 
   scoped_ptr<DriveMetadataStore> metadata_store_;
   scoped_ptr<drive::APIUtilInterface> api_util_;
 
   Profile* profile_;
 
   scoped_ptr<DriveFileSyncTaskManager> task_manager_;
 
+  scoped_ptr<drive::LocalChangeProcessorDelegate> running_local_sync_task_;
+
   // The current remote service state. This does NOT reflect the
   // sync_enabled_ flag, while GetCurrentState() DOES reflect the flag
   // value (i.e. it returns REMOTE_SERVICE_DISABLED when sync_enabled_
   // is false even if state_ is REMOTE_SERVICE_OK).
   RemoteServiceState state_;
 
   // Indicates if sync is enabled or not. This flag can be turned on or
   // off by SetSyncEnabled() method.  To start synchronization
   // this needs to be true and state_ needs to be REMOTE_SERVICE_OK.
   bool sync_enabled_;
@@ skipping 22 matching lines @@
   RemoteChangeProcessor* remote_change_processor_;
 
   ConflictResolutionPolicy conflict_resolution_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveFileSyncService);
 };
 
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_