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

chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc

 // Copyright (c) 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/extensions/api/sync_file_system/sync_file_system_api_helpers.h"
 
 #include "base/logging.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/common/fileapi/file_system_util.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/common/fileapi/file_system_util.h"
 
 namespace extensions {
 
 api::sync_file_system::ServiceStatus SyncServiceStateToExtensionEnum(
     sync_file_system::SyncServiceState state) {
   switch (state) {
     case sync_file_system::SYNC_SERVICE_RUNNING:
       return api::sync_file_system::SERVICE_STATUS_RUNNING;
     case sync_file_system::SYNC_SERVICE_AUTHENTICATION_REQUIRED:
       return api::sync_file_system::SERVICE_STATUS_AUTHENTICATION_REQUIRED;
@@ skipping 79 matching lines @@
       return api::sync_file_system::CONFLICT_RESOLUTION_POLICY_MANUAL;
     case sync_file_system::CONFLICT_RESOLUTION_POLICY_MAX:
       NOTREACHED();
       return api::sync_file_system::CONFLICT_RESOLUTION_POLICY_NONE;
   }
   NOTREACHED() << "Invalid conflict resolution policy: " << policy;
   return api::sync_file_system::CONFLICT_RESOLUTION_POLICY_NONE;
 }
 
 base::DictionaryValue* CreateDictionaryValueForFileSystemEntry(
-    const fileapi::FileSystemURL& url,
+    const storage::FileSystemURL& url,
     sync_file_system::SyncFileType file_type) {
   if (!url.is_valid() || file_type == sync_file_system::SYNC_FILE_TYPE_UNKNOWN)
     return NULL;
 
-  std::string file_path = base::FilePath(
-      fileapi::VirtualPath::GetNormalizedFilePath(url.path())).AsUTF8Unsafe();
+  std::string file_path =
+      base::FilePath(storage::VirtualPath::GetNormalizedFilePath(url.path()))
+          .AsUTF8Unsafe();
 
-  std::string root_url = fileapi::GetFileSystemRootURI(
-    url.origin(), url.mount_type()).spec();
+  std::string root_url =
+      storage::GetFileSystemRootURI(url.origin(), url.mount_type()).spec();
   if (!url.filesystem_id().empty()) {
     root_url.append(url.filesystem_id());
     root_url.append("/");
   }
 
   base::DictionaryValue* dict = new base::DictionaryValue;
   dict->SetString("fileSystemType",
-                  fileapi::GetFileSystemTypeString(url.mount_type()));
+                  storage::GetFileSystemTypeString(url.mount_type()));
   dict->SetString("fileSystemName",
-                  fileapi::GetFileSystemName(url.origin(), url.type()));
+                  storage::GetFileSystemName(url.origin(), url.type()));
   dict->SetString("rootUrl", root_url);
   dict->SetString("filePath", file_path);
   dict->SetBoolean("isDirectory",
                    (file_type == sync_file_system::SYNC_FILE_TYPE_DIRECTORY));
 
   return dict;
 }
 
 }  // namespace extensions