[SyncFS] Add ScopedEnableSyncFSV2 for testing

[SyncFS] Add ScopedEnableSyncFSV2 for testing

Add the class to temporarily enable SyncFSV2 for testing.

BUG=331988
R=kinuko@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247885

[tzik, 2014-01-30 05:13:28]

PTL

[kinuko, 2014-01-30 05:23:44]

lgtm


On Thu, Jan 30, 2014 at 2:13 PM, <tzik@chromium.org> wrote:

> Reviewers: kinuko,
>
> Message:
> PTL
>
> Description:
> [SyncFS] Add ScopedEnableSyncFSV2 for testing
>
> Add the class to temporarily enable SyncFSV2 for testing.
>
> BUG=
>
> Please review this at https://codereview.chromium.org/130913013/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files (+29, -4 lines):
>   M chrome/browser/sync_file_system/syncable_file_system_util.h
>   M chrome/browser/sync_file_system/syncable_file_system_util.cc
>
>
> Index: chrome/browser/sync_file_system/syncable_file_system_util.cc
> diff --git a/chrome/browser/sync_file_system/syncable_file_system_util.cc
> b/chrome/browser/sync_file_system/syncable_file_system_util.cc
> index 71872e7bb930a9a469f455874e04435f2046098b..
> 16965200b29f8deb39e19e8968b5b7a0bda4cfc5 100644
> --- a/chrome/browser/sync_file_system/syncable_file_system_util.cc
> +++ b/chrome/browser/sync_file_system/syncable_file_system_util.cc
> @@ -43,7 +43,9 @@ const base::FilePath::CharType kSyncFileSystemDir[] =
>  const base::FilePath::CharType kSyncFileSystemDirDev[] =
>      FILE_PATH_LITERAL("Sync FileSystem Dev");
>
> -bool is_directory_operation_enabled = false;
> +// Flags to enable features for testing.
> +bool g_is_directory_operation_enabled = false;
> +bool g_is_syncfs_v2_enabled = false;
>
>  }  // namespace
>
> @@ -119,7 +121,7 @@ bool DeserializeSyncableFileSystemURL(
>  }
>
>  void SetEnableSyncFSDirectoryOperation(bool flag) {
> -  is_directory_operation_enabled = flag;
> +  g_is_directory_operation_enabled = flag;
>  }
>
>  bool IsSyncFSDirectoryOperationEnabled() {
> @@ -127,14 +129,15 @@ bool IsSyncFSDirectoryOperationEnabled() {
>  }
>
>  bool IsSyncFSDirectoryOperationEnabled(const GURL& origin) {
> -  return is_directory_operation_enabled ||
> +  return g_is_directory_operation_enabled ||
>        CommandLine::ForCurrentProcess()->HasSwitch(
>            kEnableSyncFSDirectoryOperation) ||
>        IsV2EnabledForOrigin(origin);
>  }
>
>  bool IsV2Enabled() {
> -  return CommandLine::ForCurrentProcess()->HasSwitch(
> kEnableSyncFileSystemV2);
> +  return g_is_syncfs_v2_enabled ||
> +        CommandLine::ForCurrentProcess()->HasSwitch(
> kEnableSyncFileSystemV2);
>  }
>
>  bool IsV2EnabledForOrigin(const GURL& origin) {
> @@ -183,6 +186,16 @@ ScopedEnableSyncFSDirectoryOperation::~
> ScopedEnableSyncFSDirectoryOperation() {
>    SetEnableSyncFSDirectoryOperation(was_enabled_);
>  }
>
> +ScopedEnableSyncFSV2::ScopedEnableSyncFSV2() {
> +  was_enabled_ = IsV2Enabled();
> +  g_is_syncfs_v2_enabled = true;
> +}
> +
> +ScopedEnableSyncFSV2::~ScopedEnableSyncFSV2() {
> +  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);
> Index: chrome/browser/sync_file_system/syncable_file_system_util.h
> diff --git a/chrome/browser/sync_file_system/syncable_file_system_util.h
> b/chrome/browser/sync_file_system/syncable_file_system_util.h
> index 7e28607f8f8c3ee85f9581b7b8c1575539d1cede..
> 35512ca4f073dcb75281abd230b6e005360dfb40 100644
> --- a/chrome/browser/sync_file_system/syncable_file_system_util.h
> +++ b/chrome/browser/sync_file_system/syncable_file_system_util.h
> @@ -115,6 +115,18 @@ class ScopedEnableSyncFSDirectoryOperation {
>    DISALLOW_COPY_AND_ASSIGN(ScopedEnableSyncFSDirectoryOperation);
>  };
>
> +// Enables V2 backend for syncable filesystems temporarily for testing.
> +class ScopedEnableSyncFSV2 {
> + public:
> +  ScopedEnableSyncFSV2();
> +  ~ScopedEnableSyncFSV2();
> +
> + private:
> +  bool was_enabled_;
> +
> +  DISALLOW_COPY_AND_ASSIGN(ScopedEnableSyncFSV2);
> +};
> +
>  // Posts |callback| to the current thread.
>  void RunSoon(const tracked_objects::Location& from_here,
>               const base::Closure& callback);
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[commit-bot: I haz the power, 2014-01-30 05:31:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tzik@chromium.org/130913013/1

[commit-bot: I haz the power, 2014-01-30 07:17:44]

Retried try job too often on android_dbg for step(s) slave_steps
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...

[tzik, 2014-01-30 07:58:02]

Committed patchset #2 manually as r247885 (presubmit successful).