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

chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc

Index: chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
index e808f7b8b0e8b94f42787f5cdc46dc5d2d963c30..51aca8840ca3f3a46be9f27090a7988d484aeea0 100644
--- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
@@ -38,11 +38,11 @@
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/common/blob/scoped_file.h"
-#include "webkit/common/fileapi/file_system_util.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/common/blob/scoped_file.h"
+#include "storage/common/fileapi/file_system_util.h"
 
-using fileapi::FileSystemURL;
+using storage::FileSystemURL;
 
 namespace sync_file_system {
 
@@ -800,8 +800,7 @@ void DriveFileSyncService::DidGetDirectoryContentForBatchSync(
       metadata.set_type(DriveMetadata::RESOURCE_TYPE_FOLDER);
 
     base::FilePath path = TitleToPath(entry.title());
-    fileapi::FileSystemURL url(CreateSyncableFileSystemURL(
-        origin, path));
+    storage::FileSystemURL url(CreateSyncableFileSystemURL(origin, path));
     // TODO(calvinlo): Write metadata and origin data as single batch command
     // so it's not possible for the DB to contain a DriveMetadata with an
     // unknown origin.
@@ -833,7 +832,7 @@ void DriveFileSyncService::DidProcessRemoteChange(
     const SyncFileCallback& sync_callback,
     const SyncStatusCallback& completion_callback,
     SyncStatusCode status) {
-  fileapi::FileSystemURL url;
+  storage::FileSystemURL url;
   if (running_remote_sync_task_)
     url = running_remote_sync_task_->url();
   running_remote_sync_task_.reset();
@@ -895,13 +894,13 @@ bool DriveFileSyncService::AppendRemoteChangeInternal(
     const std::string& remote_file_md5,
     const base::Time& updated_time,
     SyncFileType file_type) {
-  fileapi::FileSystemURL url(CreateSyncableFileSystemURL(origin, path));
+  storage::FileSystemURL url(CreateSyncableFileSystemURL(origin, path));
   DCHECK(url.is_valid());
 
   // Note that we create a normalized path from url.path() rather than
   // path here (as FileSystemURL does extra normalization).
   base::FilePath::StringType normalized_path =
-    fileapi::VirtualPath::GetNormalizedFilePath(url.path());
+      storage::VirtualPath::GetNormalizedFilePath(url.path());
 
   std::string local_resource_id;
   std::string local_file_md5;
@@ -993,10 +992,9 @@ void DriveFileSyncService::RemoveRemoteChange(
   remote_change_handler_.RemoveChangeForURL(url);
 }
 
-void DriveFileSyncService::MarkConflict(
-    const fileapi::FileSystemURL& url,
-    DriveMetadata* drive_metadata,
-    const SyncStatusCallback& callback) {
+void DriveFileSyncService::MarkConflict(const storage::FileSystemURL& url,
+                                        DriveMetadata* drive_metadata,
+                                        const SyncStatusCallback& callback) {
   DCHECK(drive_metadata);
   DCHECK(!drive_metadata->resource_id().empty());
   drive_metadata->set_conflicted(true);
@@ -1007,10 +1005,9 @@ void DriveFileSyncService::MarkConflict(
           AsWeakPtr(), url, callback));
 }
 
-void DriveFileSyncService::NotifyConflict(
-    const fileapi::FileSystemURL& url,
-    const SyncStatusCallback& callback,
-    SyncStatusCode status) {
+void DriveFileSyncService::NotifyConflict(const storage::FileSystemURL& url,
+                                          const SyncStatusCallback& callback,
+                                          SyncStatusCode status) {
   if (status != SYNC_STATUS_OK) {
     callback.Run(status);
     return;