[SyncFS] Add ScopedEnableSyncFSV2 for testing

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"
@@ skipping 25 matching lines @@
 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");
 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
 
 void RegisterSyncableFileSystem() {
   ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(
       kSyncableMountName,
       fileapi::kFileSystemTypeSyncable,
       fileapi::FileSystemMountOption(),
       base::FilePath());
   ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(
@@ skipping 55 matching lines @@
   if (!deserialized.is_valid() ||
       deserialized.type() != fileapi::kFileSystemTypeSyncable) {
     return false;
   }
 
   *url = deserialized;
   return true;
 }
 
 void SetEnableSyncFSDirectoryOperation(bool flag) {
-  is_directory_operation_enabled = flag;
+  g_is_directory_operation_enabled = flag;
 }
 
 bool IsSyncFSDirectoryOperationEnabled() {
   return IsSyncFSDirectoryOperationEnabled(GURL());
 }
 
 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) {
   if (IsV2Enabled())
     return true;
 
   // Spark release channel.
   if (origin.host() == "kcjgcakhgelcejampmijgkjkadfcncjl")
     return true;
   // Spark dev channel.
@@ skipping 28 matching lines @@
 ScopedEnableSyncFSDirectoryOperation::ScopedEnableSyncFSDirectoryOperation() {
   was_enabled_ = IsSyncFSDirectoryOperationEnabled(GURL());
   SetEnableSyncFSDirectoryOperation(true);
 }
 
 ScopedEnableSyncFSDirectoryOperation::~ScopedEnableSyncFSDirectoryOperation() {
   DCHECK(IsSyncFSDirectoryOperationEnabled(GURL()));
   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);
 }
 
 }  // namespace sync_file_system