Add a testing switch to override the query for 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 c651520c80b4ca7151bb3082d255392d4c311c6a..9685ae075871c8be42728974a9742d5d33484b37 100644
--- a/components/browsing_data_ui/history_notice_utils.cc
+++ b/components/browsing_data_ui/history_notice_utils.cc
@@ -5,20 +5,33 @@
 #include "components/browsing_data_ui/history_notice_utils.h"
 
 #include "base/callback.h"
+#include "base/command_line.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/history/core/browser/web_history_service.h"
 
 namespace browsing_data_ui {
 
+namespace switches {
+
+const char kOverrideOtherFormsOfBrowsingHistoryQuery[] =
+    "override-other-forms-of-browsing-history-query";
+
+}
+
 void ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
     const ProfileSyncService* sync_service,
     history::WebHistoryService* history_service,
     base::Callback<void(bool)> callback) {
+  bool override_other_forms_of_browsing_history_query =
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kOverrideOtherFormsOfBrowsingHistoryQuery);
+
   if (!sync_service ||
       !sync_service->IsSyncActive() ||
       sync_service->IsUsingSecondaryPassphrase() ||
       !history_service ||
-      !history_service->HasOtherFormsOfBrowsingHistory()) {
+      (!override_other_forms_of_browsing_history_query &&
+       !history_service->HasOtherFormsOfBrowsingHistory())) {
     callback.Run(false);
     return;
   }