| Index: chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
|
| index 31da33647d35b762f8e2ee807a6a32ab810c17c8..d8fd8a1b1feaaf1fadb1e8139823d1dac14035af 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc
|
| @@ -48,15 +48,6 @@ typedef RemoteFileSyncService::OriginStatusMap OriginStatusMap;
|
| namespace {
|
|
|
| const base::FilePath::CharType kTempDirName[] = FILE_PATH_LITERAL("tmp");
|
| -const base::FilePath::CharType kSyncFileSystemDir[] =
|
| - FILE_PATH_LITERAL("Sync FileSystem");
|
| -const base::FilePath::CharType kSyncFileSystemDirDev[] =
|
| - FILE_PATH_LITERAL("Sync FileSystem Dev");
|
| -
|
| -const base::FilePath::CharType* GetSyncFileSystemDir() {
|
| - return IsSyncFSDirectoryOperationEnabled()
|
| - ? kSyncFileSystemDirDev : kSyncFileSystemDir;
|
| -}
|
|
|
| void EmptyStatusCallback(SyncStatusCode status) {}
|
|
|
| @@ -351,14 +342,14 @@ void DriveFileSyncService::Initialize(
|
|
|
| task_manager_ = task_manager.Pass();
|
|
|
| - temporary_file_dir_ =
|
| - profile_->GetPath().Append(GetSyncFileSystemDir()).Append(kTempDirName);
|
| + temporary_file_dir_ = sync_file_system::GetSyncFileSystemDir(
|
| + profile_->GetPath()).Append(kTempDirName);
|
|
|
| api_util_.reset(new drive_backend::APIUtil(profile_, temporary_file_dir_));
|
| api_util_->AddObserver(this);
|
|
|
| metadata_store_.reset(new DriveMetadataStore(
|
| - profile_->GetPath().Append(GetSyncFileSystemDir()),
|
| + GetSyncFileSystemDir(profile_->GetPath()),
|
| content::BrowserThread::GetMessageLoopProxyForThread(
|
| content::BrowserThread::FILE).get()));
|
|
|
|
|