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

components/sync/base/sync_prefs.cc

 // Copyright (c) 2012 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/base/sync_prefs.h"
 
 #include "base/base64.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 537 matching lines @@
   if (base::Base64Decode(encoded, &decoded)) {
     nigori_specifics->ParseFromString(decoded);
   }
 }
 
 bool SyncPrefs::IsLocalSyncEnabled() const {
   return pref_service_->GetBoolean(prefs::kEnableLocalSyncBackend);
 }
 
 base::FilePath SyncPrefs::GetLocalSyncBackendDir() const {
-  base::FilePath local_sync_backend_folder =
-      pref_service_->GetFilePath(prefs::kLocalSyncBackendDir);
-
-#if defined(OS_WIN)
-  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(
-        base::PathService::Get(base::DIR_APP_DATA, &local_sync_backend_folder));
-
-    // TODO(pastarmovj): Quick and dirty solution for stage 1 of crbug/694464
-    // for merging back into Chrome 57.
-    local_sync_backend_folder = local_sync_backend_folder.Append(
-        FILE_PATH_LITERAL("Google/Chrome/User Data"));
-  }
-#endif  // defined(OS_WIN)
-  return local_sync_backend_folder;
+  return pref_service_->GetFilePath(prefs::kLocalSyncBackendDir);
 }
 
 }  // namespace syncer