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

chrome/browser/sync_file_system/drive_backend_v1/api_util.cc

Index: chrome/browser/sync_file_system/drive_backend_v1/api_util.cc
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc b/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc
index e865cc339162c1ee1acb08751802c3e758d240d1..66bf046c0ef8d3674dfdf16f8b7843815ce69fbe 100644
--- a/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc
+++ b/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc
@@ -143,16 +143,15 @@ std::string GetMimeTypeFromTitle(const std::string& title) {
 }
 
 bool CreateTemporaryFile(const base::FilePath& dir_path,
-                         webkit_blob::ScopedFile* temp_file) {
+                         storage::ScopedFile* temp_file) {
   base::FilePath temp_file_path;
   const bool success = base::CreateDirectory(dir_path) &&
       base::CreateTemporaryFileInDir(dir_path, &temp_file_path);
   if (!success)
     return success;
-  *temp_file =
-      webkit_blob::ScopedFile(temp_file_path,
-                              webkit_blob::ScopedFile::DELETE_ON_SCOPE_OUT,
-                              base::ThreadTaskRunnerHandle::Get().get());
+  *temp_file = storage::ScopedFile(temp_file_path,
+                                   storage::ScopedFile::DELETE_ON_SCOPE_OUT,
+                                   base::ThreadTaskRunnerHandle::Get().get());
   return success;
 }
 
@@ -505,8 +504,8 @@ void APIUtil::DownloadFile(const std::string& resource_id,
   DCHECK(!temp_dir_path_.empty());
   DVLOG(2) << "Downloading file [" << resource_id << "]";
 
-  scoped_ptr<webkit_blob::ScopedFile> temp_file(new webkit_blob::ScopedFile);
-  webkit_blob::ScopedFile* temp_file_ptr = temp_file.get();
+  scoped_ptr<storage::ScopedFile> temp_file(new storage::ScopedFile);
+  storage::ScopedFile* temp_file_ptr = temp_file.get();
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&CreateTemporaryFile, temp_dir_path_, temp_file_ptr),
@@ -738,7 +737,7 @@ void APIUtil::DidGetFileResource(
 void APIUtil::DidGetTemporaryFileForDownload(
     const std::string& resource_id,
     const std::string& local_file_md5,
-    scoped_ptr<webkit_blob::ScopedFile> local_file,
+    scoped_ptr<storage::ScopedFile> local_file,
     const DownloadFileCallback& callback,
     bool success) {
   if (!success) {
@@ -761,7 +760,7 @@ void APIUtil::DidGetTemporaryFileForDownload(
 
 void APIUtil::DownloadFileInternal(
     const std::string& local_file_md5,
-    scoped_ptr<webkit_blob::ScopedFile> local_file,
+    scoped_ptr<storage::ScopedFile> local_file,
     const DownloadFileCallback& callback,
     google_apis::GDataErrorCode error,
     scoped_ptr<google_apis::ResourceEntry> entry) {
@@ -800,7 +799,7 @@ void APIUtil::DownloadFileInternal(
 }
 
 void APIUtil::DidDownloadFile(scoped_ptr<google_apis::ResourceEntry> entry,
-                              scoped_ptr<webkit_blob::ScopedFile> local_file,
+                              scoped_ptr<storage::ScopedFile> local_file,
                               const DownloadFileCallback& callback,
                               google_apis::GDataErrorCode error,
                               const base::FilePath& downloaded_file_path) {