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

chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc

 // 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.
 
 #include "chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner_util.h"
 #include "chrome/browser/drive/drive_api_util.h"
 #include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/sync_file_system/drive_backend/callback_helper.h"
 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h"
 #include "chrome/browser/sync_file_system/drive_backend/task_dependency_manager.h"
 #include "chrome/browser/sync_file_system/logger.h"
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
 #include "extensions/common/extension.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/gdata_wapi_parser.h"
-#include "webkit/common/fileapi/file_system_util.h"
+#include "storage/common/fileapi/file_system_util.h"
 
 namespace sync_file_system {
 namespace drive_backend {
 
 namespace {
 
-bool BuildFileSystemURL(
-    MetadataDatabase* metadata_database,
-    const FileTracker& tracker,
-    fileapi::FileSystemURL* url) {
+bool BuildFileSystemURL(MetadataDatabase* metadata_database,
+                        const FileTracker& tracker,
+                        storage::FileSystemURL* url) {
   base::FilePath path;
   if (!metadata_database->BuildPathForTracker(
           tracker.tracker_id(), &path))
     return false;
 
   GURL origin =
       extensions::Extension::GetBaseURLFromExtensionId(tracker.app_id());
   *url = sync_file_system::CreateSyncableFileSystemURL(origin, path);
 
   return true;
@@ skipping 23 matching lines @@
 scoped_ptr<FileMetadata> GetFileMetadata(MetadataDatabase* database,
                                          const std::string& file_id) {
   scoped_ptr<FileMetadata> metadata(new FileMetadata);
   if (!database->FindFileByFileID(file_id, metadata.get()))
     metadata.reset();
   return metadata.Pass();
 }
 
 // Creates a temporary file in |dir_path|.  This must be called on an
 // IO-allowed task runner, and the runner must be given as |file_task_runner|.
-webkit_blob::ScopedFile CreateTemporaryFile(
-    base::TaskRunner* file_task_runner) {
+storage::ScopedFile CreateTemporaryFile(base::TaskRunner* file_task_runner) {
   base::FilePath temp_file_path;
   if (!base::CreateTemporaryFile(&temp_file_path))
-    return webkit_blob::ScopedFile();
+    return storage::ScopedFile();
 
-  return webkit_blob::ScopedFile(
-      temp_file_path,
-      webkit_blob::ScopedFile::DELETE_ON_SCOPE_OUT,
-      file_task_runner);
+  return storage::ScopedFile(temp_file_path,
+                             storage::ScopedFile::DELETE_ON_SCOPE_OUT,
+                             file_task_runner);
 }
 
 }  // namespace
 
 RemoteToLocalSyncer::RemoteToLocalSyncer(SyncEngineContext* sync_context)
     : sync_context_(sync_context),
       sync_action_(SYNC_ACTION_NONE),
       prepared_(false),
       sync_root_deletion_(false),
       weak_ptr_factory_(this) {
@@ skipping 580 matching lines @@
   remote_change_processor()->ApplyRemoteChange(
       FileChange(FileChange::FILE_CHANGE_DELETE, SYNC_FILE_TYPE_UNKNOWN),
       base::FilePath(),
       url_,
       SyncCompletedCallback(token.Pass()));
 }
 
 void RemoteToLocalSyncer::DownloadFile(scoped_ptr<SyncTaskToken> token) {
   DCHECK(sync_context_->GetWorkerTaskRunner()->RunsTasksOnCurrentThread());
 
-  webkit_blob::ScopedFile file = CreateTemporaryFile(
+  storage::ScopedFile file = CreateTemporaryFile(
       make_scoped_refptr(sync_context_->GetWorkerTaskRunner()));
 
   base::FilePath path = file.path();
   drive_service()->DownloadFile(
       path, remote_metadata_->file_id(),
       base::Bind(&RemoteToLocalSyncer::DidDownloadFile,
                  weak_ptr_factory_.GetWeakPtr(),
                  base::Passed(&token), base::Passed(&file)),
       google_apis::GetContentCallback(),
       google_apis::ProgressCallback());
 }
 
 void RemoteToLocalSyncer::DidDownloadFile(scoped_ptr<SyncTaskToken> token,
-                                          webkit_blob::ScopedFile file,
+                                          storage::ScopedFile file,
                                           google_apis::GDataErrorCode error,
                                           const base::FilePath&) {
   DCHECK(sync_context_->GetWorkerTaskRunner()->RunsTasksOnCurrentThread());
 
   SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
   if (status != SYNC_STATUS_OK) {
     SyncCompleted(token.Pass(), status);
     return;
   }
 
@@ skipping 12 matching lines @@
 
   remote_change_processor()->ApplyRemoteChange(
       FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE, SYNC_FILE_TYPE_FILE),
       path, url_,
       base::Bind(&RemoteToLocalSyncer::DidApplyDownload,
                  weak_ptr_factory_.GetWeakPtr(),
                  base::Passed(&token), base::Passed(&file)));
 }
 
 void RemoteToLocalSyncer::DidApplyDownload(scoped_ptr<SyncTaskToken> token,
-                                           webkit_blob::ScopedFile,
+                                           storage::ScopedFile,
                                            SyncStatusCode status) {
   SyncCompleted(token.Pass(), status);
 }
 
 void RemoteToLocalSyncer::CreateFolder(scoped_ptr<SyncTaskToken> token) {
   remote_change_processor()->ApplyRemoteChange(
       FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                  SYNC_FILE_TYPE_DIRECTORY),
       base::FilePath(), url_,
       SyncCompletedCallback(token.Pass()));
@@ skipping 14 matching lines @@
 
 SyncStatusCallback RemoteToLocalSyncer::SyncCompletedCallback(
     scoped_ptr<SyncTaskToken> token) {
   return base::Bind(&RemoteToLocalSyncer::SyncCompleted,
                     weak_ptr_factory_.GetWeakPtr(),
                     base::Passed(&token));
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system