[SyncFS] Move APIUtil constants to V2 directory.

 * Move shared constants between V1 and V2 to drive_backend_constants.
 * Drop dependency from FakeDriveServiceHelper to APIUtil

BUG=331991

Review URL: https://codereview.chromium.org/103013003

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

chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

@@ -61,7 +61,8 @@ class ConflictResolverTest : public testing::Test,
 
     drive_uploader_.reset(new FakeDriveUploader(fake_drive_service_.get()));
     fake_drive_helper_.reset(new FakeDriveServiceHelper(
-        fake_drive_service_.get(), drive_uploader_.get()));
+        fake_drive_service_.get(), drive_uploader_.get(),
+        kSyncRootFolderTitle));
     fake_remote_change_processor_.reset(new FakeRemoteChangeProcessor);
 
     RegisterSyncableFileSystem();

chrome/browser/sync_file_system/drive_backend/drive_backend_constants.cc

@@ -8,6 +8,9 @@ namespace sync_file_system {
 namespace drive_backend {
 
 const char kSyncRootFolderTitle[] = "Chrome Syncable FileSystem";
+const char kSyncRootFolderTitleDev[] = "Chrome Syncable FileSystem Dev";
+const char kMimeTypeOctetStream[] = "application/octet-stream";
+
 const base::FilePath::CharType kDatabaseName[] =
     FILE_PATH_LITERAL("DriveMetadata_v2");
 

chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h

@@ -11,6 +11,9 @@ namespace sync_file_system {
 namespace drive_backend {
 
 extern const char kSyncRootFolderTitle[];
+extern const char kSyncRootFolderTitleDev[];
+extern const char kMimeTypeOctetStream[];
+
 extern const base::FilePath::CharType kDatabaseName[];
 
 extern const char kDatabaseVersionKey[];

chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc

@@ -9,6 +9,7 @@
 #include "base/run_loop.h"
 #include "chrome/browser/drive/drive_uploader.h"
 #include "chrome/browser/drive/fake_drive_service.h"
+#include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"
@@ -69,7 +70,8 @@ class DriveBackendSyncTest : public testing::Test {
     remote_sync_service_->Initialize();
 
     fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
-        fake_drive_service(), drive_uploader()));
+        fake_drive_service(), drive_uploader(),
+        kSyncRootFolderTitle));
 
     local_sync_service_->SetLocalChangeProcessor(remote_sync_service_.get());
     remote_sync_service_->SetRemoteChangeProcessor(local_sync_service_.get());

chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc

@@ -21,12 +21,6 @@
 namespace sync_file_system {
 namespace drive_backend {
 
-namespace {
-
-const char kMimeTypeOctetStream[] = "application/octet-stream";
-
-}  // namespace
-
 void PutServiceMetadataToBatch(const ServiceMetadata& service_metadata,
                                leveldb::WriteBatch* batch) {
   std::string value;

chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc

@@ -47,7 +47,8 @@ class ListChangesTaskTest : public testing::Test,
         fake_drive_service_.get(), base::MessageLoopProxy::current()));
 
     fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
-        fake_drive_service_.get(), drive_uploader_.get()));
+        fake_drive_service_.get(), drive_uploader_.get(),
+        kSyncRootFolderTitle));
 
     SetUpRemoteFolders();
     InitializeMetadataDatabase();

chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc

@@ -61,7 +61,8 @@ class LocalToRemoteSyncerTest : public testing::Test,
 
     drive_uploader_.reset(new FakeDriveUploader(fake_drive_service_.get()));
     fake_drive_helper_.reset(new FakeDriveServiceHelper(
-        fake_drive_service_.get(), drive_uploader_.get()));
+        fake_drive_service_.get(), drive_uploader_.get(),
+        kSyncRootFolderTitle));
     fake_remote_change_processor_.reset(new FakeRemoteChangeProcessor);
 
     RegisterSyncableFileSystem();

chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc

@@ -52,7 +52,8 @@ class RegisterAppTaskTest : public testing::Test,
         fake_drive_service_.get(), base::MessageLoopProxy::current()));
 
     fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
-        fake_drive_service_.get(), drive_uploader_.get()));
+        fake_drive_service_.get(), drive_uploader_.get(),
+        kSyncRootFolderTitle));
 
     ASSERT_EQ(google_apis::HTTP_CREATED,
               fake_drive_service_helper_->AddOrphanedFolder(

chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc

@@ -61,7 +61,8 @@ class RemoteToLocalSyncerTest : public testing::Test,
     drive_uploader_.reset(new drive::DriveUploader(
         fake_drive_service_.get(), base::MessageLoopProxy::current().get()));
     fake_drive_helper_.reset(new FakeDriveServiceHelper(
-        fake_drive_service_.get(), drive_uploader_.get()));
+        fake_drive_service_.get(), drive_uploader_.get(),
+        kSyncRootFolderTitle));
     fake_remote_change_processor_.reset(new FakeRemoteChangeProcessor);
 
     RegisterSyncableFileSystem();

chrome/browser/sync_file_system/drive_backend_v1/api_util.cc

@@ -22,6 +22,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
+#include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
 #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h"
 #include "chrome/browser/sync_file_system/logger.h"
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
@@ -42,10 +43,6 @@ enum ParentType {
   PARENT_TYPE_DIRECTORY,
 };
 
-const char kSyncRootDirectoryName[] = "Chrome Syncable FileSystem";
-const char kSyncRootDirectoryNameDev[] = "Chrome Syncable FileSystem Dev";
-const char kMimeTypeOctetStream[] = "application/octet-stream";
-
 const char kFakeAccountId[] = "test_user@gmail.com";
 
 void EmptyGDataErrorCodeCallback(google_apis::GDataErrorCode error) {}
@@ -643,8 +640,8 @@ void APIUtil::DidGetDriveRootResourceIdForEnsureSyncRoot(
 // TODO(calvinlo): Delete this when Sync Directory Operations are supported by
 // default.
 std::string APIUtil::GetSyncRootDirectoryName() {
-  return IsSyncFSDirectoryOperationEnabled() ? kSyncRootDirectoryNameDev
-                                             : kSyncRootDirectoryName;
+  return IsSyncFSDirectoryOperationEnabled() ? kSyncRootFolderTitleDev
+                                             : kSyncRootFolderTitle;
 }
 
 // static

chrome/browser/sync_file_system/drive_backend_v1/api_util_unittest.cc

@@ -63,7 +63,8 @@ class APIUtilTest : public testing::Test {
     fake_drive_uploader_ = new FakeDriveUploader(fake_drive_service_);
 
     fake_drive_helper_.reset(new FakeDriveServiceHelper(
-        fake_drive_service_, fake_drive_uploader_));
+        fake_drive_service_, fake_drive_uploader_,
+        APIUtil::GetSyncRootDirectoryName()));
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     api_util_ = APIUtil::CreateForTesting(

chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc

@@ -190,7 +190,8 @@ class DriveFileSyncServiceFakeTest : public testing::Test {
         fake_drive_service_, base::MessageLoopProxy::current().get());
 
     fake_drive_helper_.reset(new FakeDriveServiceHelper(
-        fake_drive_service_, drive_uploader));
+        fake_drive_service_, drive_uploader,
+        APIUtil::GetSyncRootDirectoryName()));
 
     api_util_ = APIUtil::CreateForTesting(
         fake_drive_helper_->base_dir_path().AppendASCII("tmp"),

chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_sync_unittest.cc

@@ -68,7 +68,8 @@ class DriveFileSyncServiceSyncTest : public testing::Test {
         fake_drive_service_, base::MessageLoopProxy::current().get());
 
     fake_drive_helper_.reset(new FakeDriveServiceHelper(
-        fake_drive_service_, drive_uploader_));
+        fake_drive_service_, drive_uploader_,
+        APIUtil::GetSyncRootDirectoryName()));
 
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
     bool created = false;

chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.cc

@@ -9,7 +9,6 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/sync_file_system/drive_backend_v1/api_util.h"
 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
 #include "chrome/browser/sync_file_system/sync_status_code.h"
 #include "content/public/test/test_browser_thread.h"
@@ -52,9 +51,11 @@ void DownloadResultCallback(GDataErrorCode* error_out,
 
 FakeDriveServiceHelper::FakeDriveServiceHelper(
     drive::FakeDriveService* fake_drive_service,
-    drive::DriveUploaderInterface* drive_uploader)
+    drive::DriveUploaderInterface* drive_uploader,
+    const std::string& sync_root_folder_title)
     : fake_drive_service_(fake_drive_service),
-      drive_uploader_(drive_uploader) {
+      drive_uploader_(drive_uploader),
+      sync_root_folder_title_(sync_root_folder_title) {
   Initialize();
 }
 
@@ -164,7 +165,7 @@ GDataErrorCode FakeDriveServiceHelper::GetSyncRootFolderID(
   GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<ResourceList> resource_list;
   fake_drive_service_->SearchByTitle(
-      APIUtil::GetSyncRootDirectoryName(), std::string(),
+      sync_root_folder_title_, std::string(),
       CreateResultReceiver(&error, &resource_list));
   base::RunLoop().RunUntilIdle();
   if (error != google_apis::HTTP_SUCCESS)

chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.h

@@ -22,7 +22,8 @@ namespace drive_backend {
 class FakeDriveServiceHelper {
  public:
   FakeDriveServiceHelper(drive::FakeDriveService* fake_drive_service,
-                         drive::DriveUploaderInterface* drive_uploader);
+                         drive::DriveUploaderInterface* drive_uploader,
+                         const std::string& sync_root_folder_title);
   virtual ~FakeDriveServiceHelper();
 
   google_apis::GDataErrorCode AddOrphanedFolder(
@@ -79,6 +80,8 @@ class FakeDriveServiceHelper {
   // Not own.
   drive::FakeDriveService* fake_drive_service_;
   drive::DriveUploaderInterface* drive_uploader_;
+
+  std::string sync_root_folder_title_;
 };
 
 }  // namespace drive_backend