| Index: components/browser_sync/profile_sync_service.cc
|
| diff --git a/components/browser_sync/profile_sync_service.cc b/components/browser_sync/profile_sync_service.cc
|
| index 222bf630f96bd08c20110da89d0b116b722e6980..e13f08d5615d0ddd7bdb3d53e8d3ba96957480d6 100644
|
| --- a/components/browser_sync/profile_sync_service.cc
|
| +++ b/components/browser_sync/profile_sync_service.cc
|
| @@ -507,16 +507,11 @@ void ProfileSyncService::InitializeBackend(bool delete_stale_data) {
|
| ClearStaleErrors();
|
|
|
| bool enable_local_sync_backend = false;
|
| - base::FilePath local_sync_backend_folder;
|
| + base::FilePath local_sync_backend_folder =
|
| + sync_prefs_.GetLocalSyncBackendDir();
|
| #if defined(OS_WIN)
|
| - enable_local_sync_backend = base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableLocalSyncBackend);
|
| - if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kLocalSyncBackendDir)) {
|
| - local_sync_backend_folder =
|
| - base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
|
| - switches::kLocalSyncBackendDir);
|
| - } else {
|
| + enable_local_sync_backend = sync_prefs_.IsLocalSyncEnabled();
|
| + 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.
|
| CHECK(
|
|
|