Convert drive::FileWriteHelper to a single function for simplification.

chrome/browser/chromeos/drive/file_system_util.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_util.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_platform_file_closer.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
-#include "chrome/browser/chromeos/drive/file_write_helper.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
+#include "chrome/browser/chromeos/drive/write_on_cache_file.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/chromeos_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/escape.h"
 #include "webkit/browser/fileapi/file_system_url.h"
@@ skipping 24 matching lines @@
       (kDriveMyDriveMountPointPath));
   return drive_mydrive_mount_path;
 }
 
 FileSystemInterface* GetFileSystem(Profile* profile) {
   DriveIntegrationService* integration_service =
       DriveIntegrationServiceFactory::GetForProfile(profile);
   return integration_service ? integration_service->file_system() : NULL;
 }
 
-FileWriteHelper* GetFileWriteHelper(Profile* profile) {
-  DriveIntegrationService* integration_service =
-      DriveIntegrationServiceFactory::GetForProfile(profile);
-  return integration_service ? integration_service->file_write_helper() : NULL;
-}
-
 std::string ReadStringFromGDocFile(const base::FilePath& file_path,
                                    const std::string& key) {
   const int64 kMaxGDocSize = 4096;
   int64 file_size = 0;
   if (!file_util::GetFileSize(file_path, &file_size) ||
       file_size > kMaxGDocSize) {
     DLOG(INFO) << "File too large to be a GDoc file " << file_path.value();
     return std::string();
   }
 
@@ skipping 228 matching lines @@
   // Move all files inside "persistent" to "files".
   MoveAllFilesFromDirectory(persistent_directory, cache_file_directory);
   base::DeleteFile(persistent_directory,  true /* recursive */);
 
   // Move all files inside "tmp" to "files".
   MoveAllFilesFromDirectory(tmp_directory, cache_file_directory);
 }
 
 void PrepareWritableFileAndRun(Profile* profile,
                                const base::FilePath& path,
-                               const OpenFileCallback& callback) {
+                               const PrepareWritableFileCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
-  if (IsUnderDriveMountPoint(path)) {
-    FileWriteHelper* file_write_helper = GetFileWriteHelper(profile);
-    if (!file_write_helper)
-      return;
-    base::FilePath remote_path(ExtractDrivePath(path));
-    file_write_helper->PrepareWritableFileAndRun(remote_path, callback);
-  } else {
+
+  FileSystemInterface* file_system = GetFileSystem(profile);
+  if (!file_system || !IsUnderDriveMountPoint(path)) {
     content::BrowserThread::GetBlockingPool()->PostTask(
-        FROM_HERE, base::Bind(callback, FILE_ERROR_OK, path));
+        FROM_HERE, base::Bind(callback, FILE_ERROR_FAILED, base::FilePath()));
+    return;
   }
+
+  const base::FilePath drive_path = ExtractDrivePath(path);
+  WriteOnCacheFile(file_system, drive_path, callback);
 }
 
 void EnsureDirectoryExists(Profile* profile,
                            const base::FilePath& directory,
                            const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
   if (IsUnderDriveMountPoint(directory)) {
     FileSystemInterface* file_system = GetFileSystem(profile);
     DCHECK(file_system);
@@ skipping 66 matching lines @@
     base::MD5Update(&context, base::StringPiece(buffer.get(), result));
   }
 
   base::MD5Digest digest;
   base::MD5Final(&digest, &context);
   return MD5DigestToBase16(digest);
 }
 
 }  // namespace util
 }  // namespace drive