drive: Remove FileCacheObserver::OnCacheCommitted

chrome/browser/chromeos/drive/file_system/copy_operation.cc

 // 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.
 
 #include "chrome/browser/chromeos/drive/file_system/copy_operation.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/task_runner_util.h"
@@ skipping 19 matching lines @@
 // Copies a file from |src_file_path| to |dest_file_path| on the local
 // file system using file_util::CopyFile.
 // Returns FILE_ERROR_OK on success or FILE_ERROR_FAILED otherwise.
 FileError CopyLocalFileOnBlockingPool(
     const base::FilePath& src_file_path,
     const base::FilePath& dest_file_path) {
   return file_util::CopyFile(src_file_path, dest_file_path) ?
       FILE_ERROR_OK : FILE_ERROR_FAILED;
 }
 
+// Stores a file to the cache and mark it dirty.
+FileError StoreAndMarkDirty(internal::FileCache* cache,
+                            const std::string& resource_id,
+                            const std::string& md5,
+                            const base::FilePath& local_file_path) {
+  FileError error = cache->Store(resource_id, md5, local_file_path,
+                                 internal::FileCache::FILE_OPERATION_COPY);
+  if (error != FILE_ERROR_OK)
+    return error;
+  return cache->MarkDirty(resource_id, md5);
+}
+
 }  // namespace
 
 CopyOperation::CopyOperation(base::SequencedTaskRunner* blocking_task_runner,
                              OperationObserver* observer,
                              JobScheduler* scheduler,
                              internal::ResourceMetadata* metadata,
                              internal::FileCache* cache,
                              google_apis::DriveServiceInterface* drive_service)
   : blocking_task_runner_(blocking_task_runner),
     observer_(observer),
@@ skipping 137 matching lines @@
 void CopyOperation::ScheduleTransferRegularFileAfterGetResourceEntry(
     const base::FilePath& local_file_path,
     const FileOperationCallback& callback,
     FileError error,
     scoped_ptr<ResourceEntry> entry) {
   if (error != FILE_ERROR_OK) {
     callback.Run(error);
     return;
   }
 
-  cache_->StoreLocallyModifiedOnUIThread(
-      entry->resource_id(),
-      entry->file_specific_info().md5(),
-      local_file_path,
-      internal::FileCache::FILE_OPERATION_COPY,
-      callback);
+  ResourceEntry* entry_ptr = entry.get();
+  base::PostTaskAndReplyWithResult(
+      blocking_task_runner_,
+      FROM_HERE,
+      base::Bind(&StoreAndMarkDirty,
+                 cache_,
+                 entry_ptr->resource_id(),
+                 entry_ptr->file_specific_info().md5(),
+                 local_file_path),
+      base::Bind(&CopyOperation::ScheduleTransferRegularFileAfterStore,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 base::Passed(&entry),
+                 callback));
+}
+
+void CopyOperation::ScheduleTransferRegularFileAfterStore(
+    scoped_ptr<ResourceEntry> entry,
+    const FileOperationCallback& callback,
+    FileError error) {
+  if (error == FILE_ERROR_OK)
+    observer_->OnCacheFileUploadNeededByOperation(entry->resource_id());
+  callback.Run(error);
 }
 
 void CopyOperation::CopyHostedDocumentToDirectory(
     const base::FilePath& dir_path,
     const std::string& resource_id,
     const base::FilePath::StringType& new_name,
     const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
@@ skipping 233 matching lines @@
       canonicalized_resource_id,
       // Drop the document extension, which should not be
       // in the document title.
       // TODO(yoshiki): Remove this code with crbug.com/223304.
       remote_dest_file_path.BaseName().RemoveExtension().value(),
       callback);
 }
 
 }  // namespace file_system
 }  // namespace drive