[local-search-service] Clean sync code of LSS
Since LSS has been sandboxed and clients are using new sandboxed LSS, we
need to clean up the code. This CL cleans the unused sync code.
Design doc: go/lss-sandboxing
Implementation plan: go/lss-sandboxing-impl
Bug: 1137560
Change-Id: If8347e621b0169ff15062deb7a8953c1c76bf6f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2594747
Reviewed-by: Jia Meng <[email protected]>
Reviewed-by: Sam McNally <[email protected]>
Reviewed-by: Colin Blundell <[email protected]>
Commit-Queue: Thanh Nguyen <[email protected]>
Cr-Commit-Position: refs/heads/master@{#838583}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 25803f34..e7769ba 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -343,7 +343,6 @@
#include "chromeos/audio/audio_devices_pref_handler_impl.h"
#include "chromeos/components/account_manager/account_manager.h"
#include "chromeos/components/local_search_service/search_metrics_reporter.h"
-#include "chromeos/components/local_search_service/search_metrics_reporter_sync.h"
#include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
#include "chromeos/constants/chromeos_switches.h"
#include "chromeos/network/fast_transition_observer.h"
@@ -423,6 +422,15 @@
// Deprecated 10/2019
const char kDisplayRotationAcceleratorDialogHasBeenAccepted[] =
"settings.a11y.display_rotation_accelerator_dialog_has_been_accepted";
+
+// Deprecated 12/2020
+const char kLocalSearchServiceSyncMetricsDailySample[] =
+ "local_search_service_sync.metrics.daily_sample";
+const char kLocalSearchServiceSyncMetricsCrosSettingsCount[] =
+ "local_search_service_sync.metrics.cros_settings_count";
+const char kLocalSearchServiceSyncMetricsHelpAppCount[] =
+ "local_search_service_sync.metrics.help_app_count";
+
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 11/2019
@@ -540,6 +548,11 @@
registry->RegisterDictionaryPref(kRegisteredSupervisedUserAllowlists);
registry->RegisterIntegerPref(kSupervisedUsersNextId, 0);
registry->RegisterStringPref(kFirstRunTrialGroup, std::string());
+
+ registry->RegisterInt64Pref(kLocalSearchServiceSyncMetricsDailySample, 0);
+ registry->RegisterIntegerPref(kLocalSearchServiceSyncMetricsHelpAppCount, 0);
+ registry->RegisterIntegerPref(kLocalSearchServiceSyncMetricsCrosSettingsCount,
+ 0);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if !defined(OS_ANDROID)
@@ -740,9 +753,6 @@
chromeos::language_prefs::RegisterPrefs(registry);
chromeos::local_search_service::SearchMetricsReporter::
RegisterLocalStatePrefs(registry);
- // TODO(crbug/1137560): Remove the Sync version later after LSS is sandboxed.
- chromeos::local_search_service::SearchMetricsReporterSync::
- RegisterLocalStatePrefs(registry);
chromeos::login::SecurityTokenSessionController::RegisterLocalStatePrefs(
registry);
chromeos::MultiProfileUserController::RegisterPrefs(registry);
@@ -1155,6 +1165,9 @@
// Added 12/2020.
local_state->ClearPref(kFirstRunTrialGroup);
+ local_state->ClearPref(kLocalSearchServiceSyncMetricsDailySample);
+ local_state->ClearPref(kLocalSearchServiceSyncMetricsCrosSettingsCount);
+ local_state->ClearPref(kLocalSearchServiceSyncMetricsHelpAppCount);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if !defined(OS_ANDROID)
