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

components/browsing_data_ui/history_notice_utils.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/browsing_data_ui/history_notice_utils.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(
     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();
 }
 
 }  // namespace browsing_data_ui