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

components/sync/base/sync_prefs.cc

Index: components/sync/base/sync_prefs.cc
diff --git a/components/sync/base/sync_prefs.cc b/components/sync/base/sync_prefs.cc
index 025f4e26e29adaa9f08beb48eefa856e6fa7a007..3a260aa248240f756b74e774415386ccbf3ac6c8 100644
--- a/components/sync/base/sync_prefs.cc
+++ b/components/sync/base/sync_prefs.cc
@@ -555,23 +555,7 @@ bool SyncPrefs::IsLocalSyncEnabled() const {
 }
 
 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