Only show the notice about other forms of browsing history if sync is active

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 a467c669836f0364030068de7c2c8c3af6e8642a..3abd8694e032500b35c3a4fb82ad0b01f657a3f2 100644
--- a/components/browsing_data_ui/history_notice_utils.cc
+++ b/components/browsing_data_ui/history_notice_utils.cc
@@ -13,6 +13,7 @@ bool ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
     const ProfileSyncService* sync_service,
     const history::WebHistoryService* history_service) {
   return sync_service &&
+         sync_service->IsSyncActive() &&
          sync_service->IsUsingSecondaryPassphrase() &&

[msarda, 2016/03/18 13:51:25]

I just want to make sure I understand: from the internal design document you say
that the other forms of browsing data should be shown when there is "no custom
passphrase". Should this be !sync_service->IsUsingSecondaryPassphrase()?

[msramek, 2016/03/18 14:01:58]

Ah, yes. Thanks for catching this!

I updated the CL description, and will write a unittest in a followup CL.

          history_service &&
          history_service->HasOtherFormsOfBrowsingHistory();