Relax the conditions to show the permanent notice about other forms of browsing history

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 1116c3f283caf34a7b0152915b347d549462d6d7..c1568f2a188375f9629ffe3c3ea73e110fea8a62 100644
--- a/components/browsing_data_ui/history_notice_utils.cc
+++ b/components/browsing_data_ui/history_notice_utils.cc
@@ -23,9 +23,7 @@ void ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
   if (!sync_service ||
       !sync_service->IsSyncActive() ||
       sync_service->IsUsingSecondaryPassphrase() ||
-      !history_service ||
-      (!testing::g_override_other_forms_of_browsing_history_query &&
-       !history_service->HasOtherFormsOfBrowsingHistory())) {
+      !history_service) {
     callback.Run(false);
     return;
   }
@@ -37,6 +35,13 @@ void ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(
     const ProfileSyncService* sync_service,
     history::WebHistoryService* history_service,
     base::Callback<void(bool)> callback) {
+  if (!history_service ||
+      (!testing::g_override_other_forms_of_browsing_history_query &&
+       !history_service->HasOtherFormsOfBrowsingHistory())) {
+    callback.Run(false);
+    return;
+  }
+
   ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
       sync_service, history_service, callback);
 }