Revert "Refactor HaTS service to manage Clank HaTS surveys"
This reverts commit 0076d35594bb0c3e0a3f46d2242b6d597ee59a37.
Reason for revert: Related to failure: https://ci.chromium.org/ui/b/8764172966563883329
Original change's description:
> Refactor HaTS service to manage Clank HaTS surveys
>
> Refactors the service and integrates the permission prompt survey
> trigger
>
> Bug: 1498980, 1495484
> Change-Id: I92853f0261bd81ad6e5b296c0c58a819bbf6b8f2
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5004674
> Reviewed-by: David Roger <[email protected]>
> Commit-Queue: Florian Jacky <[email protected]>
> Code-Coverage: [email protected] <[email protected]>
> Reviewed-by: Wenyu Fu <[email protected]>
> Reviewed-by: Dominic Battre <[email protected]>
> Auto-Submit: Florian Jacky <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#1226063}
Bug: 1498980, 1495484
Change-Id: I936c40b8bab85c99e413a418af5fb4e15fe77727
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5040565
Bot-Commit: Rubber Stamper <[email protected]>
Commit-Queue: Yifan Luo <[email protected]>
Owners-Override: Yifan Luo <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1226091}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 2c72490..82fc470 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -76,7 +76,7 @@
#include "chrome/browser/tpcd/experiment/tpcd_pref_names.h"
#include "chrome/browser/tracing/chrome_tracing_delegate.h"
#include "chrome/browser/ui/browser_ui_prefs.h"
-#include "chrome/browser/ui/hats/hats_service_desktop.h"
+#include "chrome/browser/ui/hats/hats_service.h"
#include "chrome/browser/ui/network_profile_bubble.h"
#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
#include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
@@ -138,7 +138,6 @@
#include "components/password_manager/core/browser/password_manager.h"
#include "components/payments/core/payment_prefs.h"
#include "components/performance_manager/public/user_tuning/prefs.h"
-#include "components/permissions/permission_hats_trigger_helper.h"
#include "components/permissions/pref_names.h"
#include "components/plus_addresses/plus_address_prefs.h"
#include "components/policy/core/browser/browser_policy_connector.h"
@@ -307,6 +306,7 @@
#include "components/live_caption/live_caption_controller.h"
#include "components/live_caption/live_translate_controller.h"
#include "components/ntp_tiles/custom_links_manager_impl.h"
+#include "components/permissions/permission_hats_trigger_helper.h"
#include "components/user_notes/user_notes_prefs.h"
#endif // BUILDFLAG(IS_ANDROID)
@@ -1695,7 +1695,6 @@
dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry);
dom_distiller::RegisterProfilePrefs(registry);
DownloadPrefs::RegisterProfilePrefs(registry);
- permissions::PermissionHatsTriggerHelper::RegisterProfilePrefs(registry);
history_clusters::prefs::RegisterProfilePrefs(registry);
HostContentSettingsMap::RegisterProfilePrefs(registry);
image_fetcher::ImageCache::RegisterProfilePrefs(registry);
@@ -1848,7 +1847,7 @@
extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
first_run::RegisterProfilePrefs(registry);
gcm::RegisterProfilePrefs(registry);
- HatsServiceDesktop::RegisterProfilePrefs(registry);
+ HatsService::RegisterProfilePrefs(registry);
NtpCustomBackgroundService::RegisterProfilePrefs(registry);
media_router::RegisterAccessCodeProfilePrefs(registry);
media_router::RegisterProfilePrefs(registry);
@@ -2057,6 +2056,7 @@
registry->RegisterIntegerPref(prefs::kHighEfficiencyChipExpandedCount, 0);
registry->RegisterTimePref(prefs::kLastHighEfficiencyChipExpandedTimestamp,
base::Time());
+ permissions::PermissionHatsTriggerHelper::RegisterProfilePrefs(registry);
#endif
#if BUILDFLAG(IS_ANDROID)
