Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / syncable_file_system_util.cc

diff --git a/src/chrome/browser/sync_file_system/syncable_file_system_util.cc b/src/chrome/browser/sync_file_system/syncable_file_system_util.cc
index e03f339..4e6e04b 100644 (file)
--- a/src/chrome/browser/sync_file_system/syncable_file_system_util.cc
+++ b/src/chrome/browser/sync_file_system/syncable_file_system_util.cc
@@ -9,35 +9,25 @@
 #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
@@ -45,13 +35,13 @@ void Noop() {}
 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());
 }
 
@@ -63,14 +53,14 @@ void RevokeSyncableFileSystem() {
 }
 
 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(
@@ -78,7 +68,7 @@ FileSystemURL CreateSyncableFileSystemURL(const GURL& origin,
 }
 
 FileSystemURL CreateSyncableFileSystemURLForSync(
-    fileapi::FileSystemContext* file_system_context,
+    storage::FileSystemContext* file_system_context,
     const FileSystemURL& syncable_url) {
   return ExternalMountPoints::GetSystemInstance()->CreateExternalFileSystemURL(
       syncable_url.origin(),
@@ -88,7 +78,7 @@ FileSystemURL CreateSyncableFileSystemURLForSync(
 
 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() +
@@ -105,7 +95,7 @@ bool DeserializeSyncableFileSystemURL(
   FileSystemURL deserialized =
       ExternalMountPoints::GetSystemInstance()->CrackURL(GURL(serialized_url));
   if (!deserialized.is_valid() ||
-      deserialized.type() != fileapi::kFileSystemTypeSyncable) {
+      deserialized.type() != storage::kFileSystemTypeSyncable) {
     return false;
   }
 
@@ -113,55 +103,10 @@ bool DeserializeSyncableFileSystemURL(
   return true;
 }
 
-bool IsV2Enabled() {
-  return g_is_syncfs_v2_enabled ||
-        CommandLine::ForCurrentProcess()->HasSwitch(kEnableSyncFileSystemV2);
-}
-
-bool IsV2EnabledForOrigin(const GURL& origin) {
-  if (IsV2Enabled())
-    return true;
-
-  // Spark release channel.
-  if (origin.host() == "kcjgcakhgelcejampmijgkjkadfcncjl")
-    return true;
-  // Spark dev channel.
-  if (origin.host() == "pnoffddplpippgcfjdhbmhkofpnaalpg")
-    return true;
-
-  CommandLine command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(kSyncFileSystemV2Whitelist)) {
-    std::string app_ids_string =
-        command_line.GetSwitchValueASCII(kSyncFileSystemV2Whitelist);
-    if (app_ids_string.find(origin.host()) == std::string::npos)
-      return false;
-    std::vector<std::string> app_ids;
-    Tokenize(app_ids_string, ",", &app_ids);
-    for (size_t i = 0; i < app_ids.size(); ++i) {
-      if (origin.host() == app_ids[i])
-        return true;
-    }
-  }
-
-  return false;
-}
-
 base::FilePath GetSyncFileSystemDir(const base::FilePath& profile_base_dir) {
-  if (IsV2Enabled())
-    return profile_base_dir.Append(kSyncFileSystemDir);
   return profile_base_dir.Append(kSyncFileSystemDir);
 }
 
-ScopedDisableSyncFSV2::ScopedDisableSyncFSV2() {
-  was_enabled_ = IsV2Enabled();
-  g_is_syncfs_v2_enabled = false;
-}
-
-ScopedDisableSyncFSV2::~ScopedDisableSyncFSV2() {
-  DCHECK(!IsV2Enabled());
-  g_is_syncfs_v2_enabled = was_enabled_;
-}
-
 void RunSoon(const tracked_objects::Location& from_here,
              const base::Closure& callback) {
   base::MessageLoop::current()->PostTask(from_here, callback);