drive: Remove FileCacheObserver::OnCacheCommitted

chrome/browser/chromeos/drive/file_system.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.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/platform_file.h"
@@ skipping 699 matching lines @@
                                   options,
                                   at_most_num_matches,
                                   callback);
 }
 
 void FileSystem::OnDirectoryChangedByOperation(
     const base::FilePath& directory_path) {
   OnDirectoryChanged(directory_path);
 }
 
+void FileSystem::OnCacheFileUploadNeededByOperation(
+    const std::string& resource_id) {
+  sync_client_->AddUploadTask(resource_id);
+}
+
 void FileSystem::OnDirectoryChanged(const base::FilePath& directory_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   FOR_EACH_OBSERVER(FileSystemObserver, observers_,
                     OnDirectoryChanged(directory_path));
 }
 
 void FileSystem::OnLoadFromServerComplete() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 219 matching lines @@
         base::Bind(callback, FILE_ERROR_NOT_FOUND));
     return;
   }
 
   // Step 1 of CloseFile: Get resource_id and md5 for |file_path|.
   resource_metadata_->GetResourceEntryByPathOnUIThread(
       file_path,
       base::Bind(&FileSystem::CloseFileAfterGetResourceEntry,
                  weak_ptr_factory_.GetWeakPtr(),
                  file_path,
-                 base::Bind(&FileSystem::CloseFileFinalize,
-                            weak_ptr_factory_.GetWeakPtr(),
-                            file_path,
-                            callback)));
+                 callback));
 }
 
 void FileSystem::CloseFileAfterGetResourceEntry(
     const base::FilePath& file_path,
     const FileOperationCallback& callback,
     FileError error,
     scoped_ptr<ResourceEntry> entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (entry.get() && !entry->has_file_specific_info())
     error = FILE_ERROR_NOT_FOUND;
 
-  if (error != FILE_ERROR_OK) {
-    callback.Run(error);
-    return;
-  }
-
-  // Step 2 of CloseFile: Commit the modification in cache. This will trigger
-  // background upload.
-  // TODO(benchan,kinaba): Call ClearDirtyInCache instead of CommitDirtyInCache
-  // if the file has not been modified. Come up with a way to detect the
-  // intactness effectively, or provide a method for user to declare it when
-  // calling CloseFile().
-  cache_->CommitDirtyOnUIThread(entry->resource_id(),
-                                entry->file_specific_info().md5(),
-                                callback);
-}
-
-void FileSystem::CloseFileFinalize(const base::FilePath& file_path,
-                                   const FileOperationCallback& callback,
-                                   FileError result) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(!callback.is_null());
+  // Step 2 of CloseFile: Trigger upload.
+  // TODO(benchan,kinaba): Call ClearDirtyInCache if the file has not been
+  // modified. Come up with a way to detect the intactness effectively, or
+  // provide a method for user to declare it when calling CloseFile().
+  if (error == FILE_ERROR_OK)
+    sync_client_->AddUploadTask(entry->resource_id());
 
   // Step 3 of CloseFile.
   // All the invocation of |callback| from operations initiated from CloseFile
   // must go through here. Removes the |file_path| from the remembered set so
   // that subsequent operations can open the file again.
   open_files_.erase(file_path);
 
   // Then invokes the user-supplied callback function.
-  callback.Run(result);
+  callback.Run(error);
 }
 
 void FileSystem::CheckLocalModificationAndRun(
     scoped_ptr<ResourceEntry> entry,
     const GetResourceEntryCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(entry.get());
   DCHECK(!callback.is_null());
 
   // For entries that will never be cached, use the original resource entry
@@ skipping 86 matching lines @@
     return;
   }
 
   PlatformFileInfoProto entry_file_info;
   util::ConvertPlatformFileInfoToResourceEntry(*file_info, &entry_file_info);
   *entry->mutable_file_info() = entry_file_info;
   callback.Run(FILE_ERROR_OK, entry.Pass());
 }
 
 }  // namespace drive