Retrieve the web&app activity enabled state from WebHistoryService.

components/browsing_data_ui/history_notice_utils.cc

Index: components/browsing_data_ui/history_notice_utils.cc
diff --git a/components/browsing_data_ui/history_notice_utils.cc b/components/browsing_data_ui/history_notice_utils.cc
index 7a6fa132e72adfc1a6ce8f16f677a986d5ce9a28..0abea5aa61e40a005f2a29cd44214e6af3f73291 100644
--- a/components/browsing_data_ui/history_notice_utils.cc
+++ b/components/browsing_data_ui/history_notice_utils.cc
@@ -4,19 +4,26 @@
 
 #include "components/browsing_data_ui/history_notice_utils.h"
 
+#include "base/callback.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/history/core/browser/web_history_service.h"
 
 namespace browsing_data_ui {
 
-bool ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
+void ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
     const ProfileSyncService* sync_service,
-    const history::WebHistoryService* history_service) {
-  return sync_service &&
-         sync_service->IsSyncActive() &&
-         !sync_service->IsUsingSecondaryPassphrase() &&
-         history_service &&
-         history_service->HasOtherFormsOfBrowsingHistory();
+    history::WebHistoryService* history_service,
+    base::Callback<void(bool)> callback) {
+  if (!sync_service ||
+      !sync_service->IsSyncActive() ||
+      sync_service->IsUsingSecondaryPassphrase() ||
+      !history_service ||
+      !history_service->HasOtherFormsOfBrowsingHistory()) {
+    callback.Run(false);
+    return;
+  }
+
+  history_service->QueryWebAndAppActivity(callback);
 }
 
 }  // namespace browsing_data_ui