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

chrome/browser/sync_file_system/drive_backend_v1/remote_sync_delegate.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_v1/remote_sync_delegate.h"
 
 #include "base/file_util.h"
 #include "chrome/browser/sync_file_system/drive_backend_v1/remote_sync_operation_resolver.h"
 #include "chrome/browser/sync_file_system/logger.h"
 #include "chrome/browser/sync_file_system/remote_change_processor.h"
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
 
-using fileapi::FileSystemURL;
+using storage::FileSystemURL;
 
 namespace {
 
 void EmptyStatusCallback(sync_file_system::SyncStatusCode status) {}
 
 }  // namespace
 
 namespace sync_file_system {
 namespace drive_backend {
 
@@ skipping 169 matching lines @@
     md5_checksum = drive_metadata_.md5_checksum();
 
   api_util()->DownloadFile(
       remote_change_.resource_id,
       md5_checksum,
       base::Bind(&RemoteSyncDelegate::DidDownloadFile,
                  AsWeakPtr(),
                  callback));
 }
 
-void RemoteSyncDelegate::DidDownloadFile(
-    const SyncStatusCallback& callback,
-    google_apis::GDataErrorCode error,
-    const std::string& md5_checksum,
-    int64 file_size,
-    const base::Time& updated_time,
-    webkit_blob::ScopedFile downloaded_file) {
+void RemoteSyncDelegate::DidDownloadFile(const SyncStatusCallback& callback,
+                                         google_apis::GDataErrorCode error,
+                                         const std::string& md5_checksum,
+                                         int64 file_size,
+                                         const base::Time& updated_time,
+                                         storage::ScopedFile downloaded_file) {
   if (error == google_apis::HTTP_NOT_MODIFIED) {
     sync_action_ = SYNC_ACTION_NONE;
     DidApplyRemoteChange(callback, SYNC_STATUS_OK);
     return;
   }
 
   // File may be deleted. If this was for new file it's ok, if this was
   // for existing file we'll process the delete change later.
   if (error == google_apis::HTTP_NOT_FOUND) {
     sync_action_ = SYNC_ACTION_NONE;
@@ skipping 263 matching lines @@
 RemoteChangeProcessor* RemoteSyncDelegate::remote_change_processor() {
   return sync_service_->remote_change_processor_;
 }
 
 ConflictResolutionResolver* RemoteSyncDelegate::conflict_resolution_resolver() {
   return &sync_service_->conflict_resolution_resolver_;
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system