[sync] Clean up path generation for the local sync database.

components/sync/driver/sync_service_base.cc

 // Copyright 2016 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 "components/sync/driver/sync_service_base.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 40 matching lines @@
   }
   return factory_switches;
 }
 
 }  // namespace
 
 SyncServiceBase::SyncServiceBase(std::unique_ptr<SyncClient> sync_client,
                                  std::unique_ptr<SigninManagerWrapper> signin,
                                  const version_info::Channel& channel,
                                  const base::FilePath& base_directory,
+                                 const base::FilePath& local_sync_directory,
                                  const std::string& debug_identifier)
     : sync_client_(std::move(sync_client)),
       signin_(std::move(signin)),
       channel_(channel),
       base_directory_(base_directory),
       sync_data_folder_(
           base_directory_.Append(base::FilePath(kSyncDataFolderName))),
+      local_sync_directory_(local_sync_directory),
       debug_identifier_(debug_identifier),
       sync_prefs_(sync_client_->GetPrefService()) {
   ResetCryptoState();
 }
 
 SyncServiceBase::~SyncServiceBase() = default;
 
 void SyncServiceBase::AddObserver(SyncServiceObserver* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   observers_.AddObserver(observer);
@@ skipping 60 matching lines @@
       base::Bind(ReportUnrecoverableError, channel_);
   params.saved_nigori_state = crypto_->TakeSavedNigoriState();
   sync_prefs_.GetInvalidationVersions(&params.invalidation_versions);
 
   engine_->Initialize(std::move(params));
 }
 
 bool SyncServiceBase::GetLocalSyncConfig(
     base::FilePath* local_sync_backend_folder) const {
   bool enable_local_sync_backend = false;
-  *local_sync_backend_folder = sync_prefs_.GetLocalSyncBackendDir();
 #if defined(OS_WIN)
   enable_local_sync_backend = sync_prefs_.IsLocalSyncEnabled();
+  *local_sync_backend_folder = local_sync_directory_;
   UMA_HISTOGRAM_BOOLEAN("Sync.Local.Enabled", enable_local_sync_backend);
-  if (local_sync_backend_folder->empty()) {
-    // TODO(pastarmovj): Add DIR_ROAMING_USER_DATA to PathService to simplify
-    // this code and move the logic in its right place. See crbug/657810.
-    if (!base::PathService::Get(base::DIR_APP_DATA,
-                                local_sync_backend_folder)) {
-      SYSLOG(WARNING) << "Local sync can not get the roaming profile folder.";
-      UMA_HISTOGRAM_BOOLEAN("Sync.Local.RoamingProfileUnavailable", false);
-      return false;
-    }
-    *local_sync_backend_folder = local_sync_backend_folder->Append(
-        FILE_PATH_LITERAL("Chrome/User Data"));
-  }
-  // This code as it is now will assume the same profile order is present on all
-  // machines, which is not a given. It is to be defined if only the Default
-  // profile should get this treatment or all profile as is the case now. The
-  // solution for now will be to assume profiles are created in the same order
-  // on all machines and in the future decide if only the Default one should be
-  // considered roamed.
-  // See http://crbug.com/674928.
-  *local_sync_backend_folder =
-      local_sync_backend_folder->Append(base_directory_.BaseName());
-  *local_sync_backend_folder =
-      local_sync_backend_folder->Append(kLoopbackServerBackendFilename);
 #endif  // defined(OS_WIN)
   return enable_local_sync_backend;
 }
 
 void SyncServiceBase::ResetCryptoState() {
   crypto_ = base::MakeUnique<SyncServiceCrypto>(
       base::BindRepeating(&SyncServiceBase::NotifyObservers,
                           base::Unretained(this)),
       base::BindRepeating(&SyncService::GetPreferredDataTypes,
                           base::Unretained(this)),
       &sync_prefs_);
 }
 
 }  // namespace syncer