SyncFS: Update outdated function names and comments in SyncFS utilities

A command line flag "--enable-sync-directory-operations" has been outdated,
and currently we use "--enable-syncfs-directory-operations" instead of it. 

This change updates function names and comments about the flag.


BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/15266002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201065 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 29 insertions, 29 deletions

diff --git a/chrome/browser/sync_file_system/drive/api_util.cc b/chrome/browser/sync_file_system/drive/api_util.cc
index 2509637..14653a8 100644
--- a/chrome/browser/sync_file_system/drive/api_util.cc
+++ b/chrome/browser/sync_file_system/drive/api_util.cc
@@ -526,8 +526,8 @@ void APIUtil::EnsureSyncRootIsNotInMyDrive(
 // TODO(calvinlo): Delete this when Sync Directory Operations are supported by
 // default.
 std::string APIUtil::GetSyncRootDirectoryName() {
-  return IsSyncDirectoryOperationEnabled() ? kSyncRootDirectoryNameDev
-                                           : kSyncRootDirectoryName;
+  return IsSyncFSDirectoryOperationEnabled() ? kSyncRootDirectoryNameDev
+                                             : kSyncRootDirectoryName;
 }
 
 // static
diff --git a/chrome/browser/sync_file_system/drive/local_change_processor_delegate.cc b/chrome/browser/sync_file_system/drive/local_change_processor_delegate.cc
index a32172e..7d7855e 100644
--- a/chrome/browser/sync_file_system/drive/local_change_processor_delegate.cc
+++ b/chrome/browser/sync_file_system/drive/local_change_processor_delegate.cc
@@ -36,7 +36,7 @@ void LocalChangeProcessorDelegate::Run(const SyncStatusCallback& callback) {
     return;
 
   // TODO(nhiroki): support directory operations (http://crbug.com/161442).
-  DCHECK(IsSyncDirectoryOperationEnabled() || !local_change_.IsDirectory());
+  DCHECK(IsSyncFSDirectoryOperationEnabled() || !local_change_.IsDirectory());
 
   has_drive_metadata_ =
       metadata_store()->ReadEntry(url_, &drive_metadata_) == SYNC_STATUS_OK;
@@ -168,7 +168,7 @@ void LocalChangeProcessorDelegate::CreateDirectory(
   if (!sync_service_)
     return;
 
-  DCHECK(IsSyncDirectoryOperationEnabled());
+  DCHECK(IsSyncFSDirectoryOperationEnabled());
   api_util()->CreateDirectory(
       origin_resource_id_,
       DriveFileSyncService::PathToTitle(url_.path()),
@@ -284,7 +284,7 @@ void LocalChangeProcessorDelegate::DeleteDirectory(
   if (!sync_service_)
     return;
 
-  DCHECK(IsSyncDirectoryOperationEnabled());
+  DCHECK(IsSyncFSDirectoryOperationEnabled());
   DCHECK(has_drive_metadata_);
   // This does not handle recursive directory deletion
   // (which should not happen other than after a restart).
@@ -368,7 +368,7 @@ void LocalChangeProcessorDelegate::DidDeleteFileToResolveToLocal(
     return;
   }
 
-  DCHECK(IsSyncDirectoryOperationEnabled());
+  DCHECK(IsSyncFSDirectoryOperationEnabled());
   DCHECK_EQ(SYNC_FILE_TYPE_DIRECTORY, local_metadata_.file_type);
   CreateDirectory(callback);
 }
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_file_sync_service.cc
index 3e25e35..967d833 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc
@@ -57,7 +57,7 @@ const base::FilePath::CharType kSyncFileSystemDirDev[] =
     FILE_PATH_LITERAL("Sync FileSystem Dev");
 
 const base::FilePath::CharType* GetSyncFileSystemDir() {
-  return IsSyncDirectoryOperationEnabled()
+  return IsSyncFSDirectoryOperationEnabled()
       ? kSyncFileSystemDirDev : kSyncFileSystemDir;
 }
 
@@ -1055,7 +1055,7 @@ void DriveFileSyncService::DidApplyRemoteChange(
   if (param->remote_change.change.IsFile()) {
     param->drive_metadata.set_type(DriveMetadata::RESOURCE_TYPE_FILE);
   } else {
-    DCHECK(IsSyncDirectoryOperationEnabled());
+    DCHECK(IsSyncFSDirectoryOperationEnabled());
     param->drive_metadata.set_type(DriveMetadata::RESOURCE_TYPE_FOLDER);
   }
 
@@ -1238,7 +1238,7 @@ bool DriveFileSyncService::AppendRemoteChange(
   if (!entry.is_folder() && !entry.is_file() && !entry.deleted())
     return false;
 
-  if (entry.is_folder() && !IsSyncDirectoryOperationEnabled())
+  if (entry.is_folder() && !IsSyncFSDirectoryOperationEnabled())
     return false;
 
   SyncFileType file_type = entry.is_file() ?
@@ -1334,7 +1334,7 @@ bool DriveFileSyncService::AppendRemoteChangeInternal(
     if (!remote_resource_id.empty() &&
         !local_resource_id.empty() &&
         remote_resource_id == local_resource_id) {
-      DCHECK(IsSyncDirectoryOperationEnabled() ||
+      DCHECK(IsSyncFSDirectoryOperationEnabled() ||
              DriveMetadata::RESOURCE_TYPE_FILE == metadata.type());
       file_type = metadata.type() == DriveMetadata::RESOURCE_TYPE_FILE ?
           SYNC_FILE_TYPE_FILE : SYNC_FILE_TYPE_DIRECTORY;
@@ -1483,7 +1483,7 @@ void DriveFileSyncService::NotifyLastOperationStatus(
 
 // static
 std::string DriveFileSyncService::PathToTitle(const base::FilePath& path) {
-  if (!IsSyncDirectoryOperationEnabled())
+  if (!IsSyncFSDirectoryOperationEnabled())
     return path.AsUTF8Unsafe();
 
   return fileapi::FilePathToString(
@@ -1492,7 +1492,7 @@ std::string DriveFileSyncService::PathToTitle(const base::FilePath& path) {
 
 // static
 base::FilePath DriveFileSyncService::TitleToPath(const std::string& title) {
-  if (!IsSyncDirectoryOperationEnabled())
+  if (!IsSyncFSDirectoryOperationEnabled())
     return base::FilePath::FromUTF8Unsafe(title);
 
   return fileapi::StringToFilePath(title).NormalizePathSeparators();
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc b/chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc
index d0f2e2e..680d1a8 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service_sync_unittest.cc
@@ -58,13 +58,13 @@ class DriveFileSyncServiceSyncTest : public testing::Test {
   }
 
   virtual void SetUp() OVERRIDE {
-    SetEnableSyncDirectoryOperation(true);
+    SetEnableSyncFSDirectoryOperation(true);
     RegisterSyncableFileSystem(DriveFileSyncService::kServiceName);
   }
 
   virtual void TearDown() OVERRIDE {
     RevokeSyncableFileSystem(DriveFileSyncService::kServiceName);
-    SetEnableSyncDirectoryOperation(false);
+    SetEnableSyncFSDirectoryOperation(false);
   }
 
  protected:
diff --git a/webkit/fileapi/obfuscated_file_util.cc b/webkit/fileapi/obfuscated_file_util.cc
index 894209f..581c2a1 100644
--- a/webkit/fileapi/obfuscated_file_util.cc
+++ b/webkit/fileapi/obfuscated_file_util.cc
@@ -340,7 +340,7 @@ PlatformFileError ObfuscatedFileUtil::CreateDirectory(
   // operations or clean up the code if we decided not to support directory
   // operations. (http://crbug.com/161442)
   if (url.type() == kFileSystemTypeSyncable &&
-      !sync_file_system::IsSyncDirectoryOperationEnabled()) {
+      !sync_file_system::IsSyncFSDirectoryOperationEnabled()) {
     return base::PLATFORM_FILE_ERROR_INVALID_OPERATION;
   }
 
diff --git a/webkit/fileapi/syncable/canned_syncable_file_system.cc b/webkit/fileapi/syncable/canned_syncable_file_system.cc
index 1182f26..97efe2a 100644
--- a/webkit/fileapi/syncable/canned_syncable_file_system.cc
+++ b/webkit/fileapi/syncable/canned_syncable_file_system.cc
@@ -222,7 +222,7 @@ void CannedSyncableFileSystem::SetUp() {
 
   // In testing we override this setting to support directory operations
   // by default.
-  SetEnableSyncDirectoryOperation(true);
+  SetEnableSyncFSDirectoryOperation(true);
 
   is_filesystem_set_up_ = true;
 }
@@ -230,7 +230,7 @@ void CannedSyncableFileSystem::SetUp() {
 void CannedSyncableFileSystem::TearDown() {
   quota_manager_ = NULL;
   file_system_context_ = NULL;
-  SetEnableSyncDirectoryOperation(false);
+  SetEnableSyncFSDirectoryOperation(false);
 
   // Make sure we give some more time to finish tasks on other threads.
   EnsureLastTaskRuns(io_task_runner_);
diff --git a/webkit/fileapi/syncable/syncable_file_system_operation.cc b/webkit/fileapi/syncable/syncable_file_system_operation.cc
index 2847bca..ce367c8 100644
--- a/webkit/fileapi/syncable/syncable_file_system_operation.cc
+++ b/webkit/fileapi/syncable/syncable_file_system_operation.cc
@@ -356,7 +356,7 @@ SyncableFileSystemOperation::SyncableFileSystemOperation(
     return;
   }
   operation_runner_ = file_system_context->sync_context()->operation_runner();
-  is_directory_operation_enabled_ = IsSyncDirectoryOperationEnabled();
+  is_directory_operation_enabled_ = IsSyncFSDirectoryOperationEnabled();
 }
 
 LocalFileSystemOperation* SyncableFileSystemOperation::NewOperation() {
diff --git a/webkit/fileapi/syncable/syncable_file_system_unittest.cc b/webkit/fileapi/syncable/syncable_file_system_unittest.cc
index 30d2a40..51edd4d 100644
--- a/webkit/fileapi/syncable/syncable_file_system_unittest.cc
+++ b/webkit/fileapi/syncable/syncable_file_system_unittest.cc
@@ -239,7 +239,7 @@ TEST_F(SyncableFileSystemTest, ChangeTrackerSimple) {
 
 // Make sure directory operation is disabled (when it's configured so).
 TEST_F(SyncableFileSystemTest, DisableDirectoryOperations) {
-  SetEnableSyncDirectoryOperation(false);
+  SetEnableSyncFSDirectoryOperation(false);
   EXPECT_EQ(base::PLATFORM_FILE_OK,
             file_system_.OpenFileSystem());
 
diff --git a/webkit/fileapi/syncable/syncable_file_system_util.cc b/webkit/fileapi/syncable/syncable_file_system_util.cc
index 1dbfda5..2f2c48a 100644
--- a/webkit/fileapi/syncable/syncable_file_system_util.cc
+++ b/webkit/fileapi/syncable/syncable_file_system_util.cc
@@ -23,7 +23,7 @@ namespace {
 // A command switch to enable syncing directory operations in Sync FileSystem
 // API. (http://crbug.com/161442)
 // TODO(kinuko): this command-line switch should be temporary.
-const char kEnableSyncDirectoryOperation[]  =
+const char kEnableSyncFSDirectoryOperation[] =
     "enable-syncfs-directory-operation";
 
 bool is_directory_operation_enabled = false;
@@ -97,14 +97,14 @@ LocalFileSystemOperation* CreateFileSystemOperationForSync(
       CreateFileSystemOperationForSync(file_system_context);
 }
 
-void SetEnableSyncDirectoryOperation(bool flag) {
+void SetEnableSyncFSDirectoryOperation(bool flag) {
   is_directory_operation_enabled = flag;
 }
 
-bool IsSyncDirectoryOperationEnabled() {
+bool IsSyncFSDirectoryOperationEnabled() {
   return is_directory_operation_enabled ||
       CommandLine::ForCurrentProcess()->HasSwitch(
-          kEnableSyncDirectoryOperation);
+          kEnableSyncFSDirectoryOperation);
 }
 
 }  // namespace sync_file_system
diff --git a/webkit/fileapi/syncable/syncable_file_system_util.h b/webkit/fileapi/syncable/syncable_file_system_util.h
index 12d4db6..15604ea5 100644
--- a/webkit/fileapi/syncable/syncable_file_system_util.h
+++ b/webkit/fileapi/syncable/syncable_file_system_util.h
@@ -85,18 +85,18 @@ WEBKIT_STORAGE_EXPORT fileapi::LocalFileSystemOperation*
     CreateFileSystemOperationForSync(
         fileapi::FileSystemContext* file_system_context);
 
-// Enables or disables directory operations in Syncable FileSystem.
+// Enables or disables directory operations in Sync FileSystem API.
 // TODO(nhiroki): This method should be used only for testing and should go
 // away when we fully support directory operations. (http://crbug.com/161442)
-WEBKIT_STORAGE_EXPORT void SetEnableSyncDirectoryOperation(bool flag);
+WEBKIT_STORAGE_EXPORT void SetEnableSyncFSDirectoryOperation(bool flag);
 
-// Returns true if we allow directory operations in syncable file system
+// Returns true if we allow directory operations in Sync FileSystem API.
 // It is disabled by default but can be overridden by a command-line switch
-// (--enable-sync-directory-operations) or by calling
-// SetEnableSyncDirectoryOperation().
+// (--enable-syncfs-directory-operations) or by calling
+// SetEnableSyncFSDirectoryOperation().
 // TODO(nhiroki): This method should be used only for testing and should go
 // away when we fully support directory operations. (http://crbug.com/161442)
-WEBKIT_STORAGE_EXPORT bool IsSyncDirectoryOperationEnabled();
+WEBKIT_STORAGE_EXPORT bool IsSyncFSDirectoryOperationEnabled();
 
 }  // namespace sync_file_system