Query the existence other forms of browsing history.

components/browsing_data_ui/history_notice_utils.h

Index: components/browsing_data_ui/history_notice_utils.h
diff --git a/components/browsing_data_ui/history_notice_utils.h b/components/browsing_data_ui/history_notice_utils.h
index c3ab520d5ee69269011cda7091867744b72f8f89..66f0d9e9ea311ce04ff3927b2f460530758cf0d9 100644
--- a/components/browsing_data_ui/history_notice_utils.h
+++ b/components/browsing_data_ui/history_notice_utils.h
@@ -5,14 +5,22 @@
 #ifndef COMPONENTS_BROWSING_DATA_UI_HISTORY_NOTICE_UTILS_H_
 #define COMPONENTS_BROWSING_DATA_UI_HISTORY_NOTICE_UTILS_H_
 
-#include "base/callback_forward.h"
+#include <string>
 
-class ProfileSyncService;
+#include "base/callback_forward.h"
 
 namespace history {
 class WebHistoryService;
 }
 
+namespace sync_driver {
+class SyncService;
+}
+
+namespace version_info {
+enum class Channel;
+}
+
 namespace browsing_data_ui {
 
 namespace testing {
@@ -23,23 +31,27 @@ namespace testing {
 // found. Used only for testing. The default is false.
 extern bool g_override_other_forms_of_browsing_history_query;
 
-}
+}  // testing
 
 // Whether the Clear Browsing Data UI should show a notice about the existence
 // of other forms of browsing history stored in user's account. The response
 // is returned in a |callback|.
 void ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
-    const ProfileSyncService* sync_service,
+    const sync_driver::SyncService* sync_service,
     history::WebHistoryService* history_service,
     base::Callback<void(bool)> callback);
 
 // Whether the Clear Browsing Data UI should popup a dialog with information
 // about the existence of other forms of browsing history stored in user's
 // account when the user deletes their browsing history for the first time.
-// The response is returned in a |callback|.
+// The response is returned in a |callback|. The |channel| and |user_agent|
+// must be provided for successful communication with the Sync server, but
+// the result does not depend from them.
 void ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(

[msarda, 2016/05/23 12:37:21]

I just realized this. Please keep the old form of this function (and its
previous implementation) so that we do not break the Chrome iOS roller
downstream. We can remove it once the Chrome iOS roller has rolled this fix and
once the matching downstream CL has been landed.

[msramek, 2016/05/23 19:18:12]

Done. As discussed elsewhere, I'm still changing ProfileSyncService to
SyncService to avoid extra includes and dependencies. This should not break
downstream, as one inherits from the other.

-    const ProfileSyncService* sync_service,
+    const sync_driver::SyncService* sync_service,
     history::WebHistoryService* history_service,
+    version_info::Channel channel,
+    const std::string& user_agent,
     base::Callback<void(bool)> callback);
 
 }  // namespace browsing_data_ui