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

chrome/browser/sync_file_system/syncable_file_system_util.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/syncable_file_system_util.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/strings/string_util.h"
-#include "webkit/browser/fileapi/external_mount_points.h"
-#include "webkit/browser/fileapi/file_observers.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/common/fileapi/file_system_util.h"
+#include "storage/browser/fileapi/external_mount_points.h"
+#include "storage/browser/fileapi/file_observers.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/common/fileapi/file_system_util.h"
 
-using fileapi::ExternalMountPoints;
-using fileapi::FileSystemContext;
-using fileapi::FileSystemURL;
+using storage::ExternalMountPoints;
+using storage::FileSystemContext;
+using storage::FileSystemURL;
 
 namespace sync_file_system {
 
 namespace {
 
 // A command switch to enable V2 Sync FileSystem.
 const char kEnableSyncFileSystemV2[] = "enable-syncfs-v2";
 
 // A command switch to specify comma-separated app IDs to enable V2 Sync
 // FileSystem.
 const char kSyncFileSystemV2Whitelist[] = "syncfs-v2-whitelist";
 
 const char kSyncableMountName[] = "syncfs";
 const char kSyncableMountNameForInternalSync[] = "syncfs-internal";
 
 const base::FilePath::CharType kSyncFileSystemDir[] =
     FILE_PATH_LITERAL("Sync FileSystem");
 
 // Flags to enable features for testing.
 bool g_is_syncfs_v2_enabled = true;
 
 void Noop() {}
 
 }  // namespace
 
 void RegisterSyncableFileSystem() {
   ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(
       kSyncableMountName,
-      fileapi::kFileSystemTypeSyncable,
-      fileapi::FileSystemMountOption(),
+      storage::kFileSystemTypeSyncable,
+      storage::FileSystemMountOption(),
       base::FilePath());
   ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(
       kSyncableMountNameForInternalSync,
-      fileapi::kFileSystemTypeSyncableForInternalSync,
-      fileapi::FileSystemMountOption(),
+      storage::kFileSystemTypeSyncableForInternalSync,
+      storage::FileSystemMountOption(),
       base::FilePath());
 }
 
 void RevokeSyncableFileSystem() {
   ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(
       kSyncableMountName);
   ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(
       kSyncableMountNameForInternalSync);
 }
 
 GURL GetSyncableFileSystemRootURI(const GURL& origin) {
-  return GURL(fileapi::GetExternalFileSystemRootURIString(
-      origin, kSyncableMountName));
+  return GURL(
+      storage::GetExternalFileSystemRootURIString(origin, kSyncableMountName));
 }
 
 FileSystemURL CreateSyncableFileSystemURL(const GURL& origin,
                                           const base::FilePath& path) {
   base::FilePath path_for_url = path;
-  if (fileapi::VirtualPath::IsAbsolute(path.value()))
+  if (storage::VirtualPath::IsAbsolute(path.value()))
     path_for_url = base::FilePath(path.value().substr(1));
 
   return ExternalMountPoints::GetSystemInstance()->CreateExternalFileSystemURL(
       origin, kSyncableMountName, path_for_url);
 }
 
 FileSystemURL CreateSyncableFileSystemURLForSync(
-    fileapi::FileSystemContext* file_system_context,
+    storage::FileSystemContext* file_system_context,
     const FileSystemURL& syncable_url) {
   return ExternalMountPoints::GetSystemInstance()->CreateExternalFileSystemURL(
       syncable_url.origin(),
       kSyncableMountNameForInternalSync,
       syncable_url.path());
 }
 
 bool SerializeSyncableFileSystemURL(const FileSystemURL& url,
                                     std::string* serialized_url) {
-  if (!url.is_valid() || url.type() != fileapi::kFileSystemTypeSyncable)
+  if (!url.is_valid() || url.type() != storage::kFileSystemTypeSyncable)
     return false;
   *serialized_url =
       GetSyncableFileSystemRootURI(url.origin()).spec() +
       url.path().AsUTF8Unsafe();
   return true;
 }
 
 bool DeserializeSyncableFileSystemURL(
     const std::string& serialized_url, FileSystemURL* url) {
 #if !defined(FILE_PATH_USES_WIN_SEPARATORS)
   DCHECK(serialized_url.find('\\') == std::string::npos);
 #endif  // FILE_PATH_USES_WIN_SEPARATORS
 
   FileSystemURL deserialized =
       ExternalMountPoints::GetSystemInstance()->CrackURL(GURL(serialized_url));
   if (!deserialized.is_valid() ||
-      deserialized.type() != fileapi::kFileSystemTypeSyncable) {
+      deserialized.type() != storage::kFileSystemTypeSyncable) {
     return false;
   }
 
   *url = deserialized;
   return true;
 }
 
 bool IsV2Enabled() {
   return g_is_syncfs_v2_enabled ||
         CommandLine::ForCurrentProcess()->HasSwitch(kEnableSyncFileSystemV2);
@@ skipping 46 matching lines @@
 void RunSoon(const tracked_objects::Location& from_here,
              const base::Closure& callback) {
   base::MessageLoop::current()->PostTask(from_here, callback);
 }
 
 base::Closure NoopClosure() {
   return base::Bind(&Noop);
 }
 
 }  // namespace sync_file_system