Show autofill sync status in CBD

chrome/browser/browsing_data/passwords_counter_browsertest.cc

 // Copyright (c) 2015 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/core/counters/passwords_counter.h"
 
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
@@ skipping 314 matching lines @@
   // We sync all datatypes by default, so starting Sync means that we start
   // syncing passwords, and this should restart the counter.
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(sync_service->IsSyncActive());
   ASSERT_TRUE(sync_service->GetPreferredDataTypes().Has(syncer::PASSWORDS));
   WaitForCountingOrConfirmFinished();
   EXPECT_TRUE(PasswordSyncEnabled());
 
   // We stop syncing passwords in particular. This restarts the counter.
   syncer::ModelTypeSet everything_except_passwords =
-      syncer::ModelTypeSet::All();
+      syncer::UserSelectableTypes();
   everything_except_passwords.Remove(syncer::PASSWORDS);
   auto sync_blocker = sync_service->GetSetupInProgressHandle();
-  sync_service->ChangePreferredDataTypes(everything_except_passwords);
+  sync_service->OnUserChoseDatatypes(/*sync_everything=*/false,
+                                     everything_except_passwords);
+  ASSERT_FALSE(sync_service->GetPreferredDataTypes().Has(syncer::PASSWORDS));
   sync_blocker.reset();
   WaitForCountingOrConfirmFinished();
+  ASSERT_FALSE(sync_service->GetPreferredDataTypes().Has(syncer::PASSWORDS));
   EXPECT_FALSE(PasswordSyncEnabled());
 
   // If password sync is not affected, the counter is not restarted.
   syncer::ModelTypeSet only_history(syncer::HISTORY_DELETE_DIRECTIVES);
   sync_service->ChangePreferredDataTypes(only_history);
   sync_blocker = sync_service->GetSetupInProgressHandle();
   sync_service->ChangePreferredDataTypes(only_history);
   sync_blocker.reset();
   EXPECT_FALSE(CountingFinishedSinceLastAsked());
 
   // We start syncing passwords again. This restarts the counter.
   sync_blocker = sync_service->GetSetupInProgressHandle();
   sync_service->ChangePreferredDataTypes(syncer::ModelTypeSet::All());
   sync_blocker.reset();
   WaitForCountingOrConfirmFinished();
   EXPECT_TRUE(PasswordSyncEnabled());
 
   // Stopping the Sync service triggers a restart.
   sync_service->RequestStop(syncer::SyncService::CLEAR_DATA);
   WaitForCountingOrConfirmFinished();
   EXPECT_FALSE(PasswordSyncEnabled());
 }
 
 }  // namespace