Remove SyncService::OnUserChoseDatatypes

It has been replaced by SyncUserSettings::SetChosenDataTypes.
Note that *Profile*SyncService::OnUserChoseDatatypes still exists for
now (it's used by SyncUserSettings). This will be changed in a later CL.

This required a minor change in unified_consent_service_unittest.cc:
This test's implementation of TestSyncService used to override
OnUserChoseDatatypes. This logic is now moved (in slightly generalized
form) into TestSyncUserSettings.

Bug: 884159
Change-Id: I6723543f78a3f8c42f9bc29a9da84376ad92126b
Reviewed-on: https://chromium-review.googlesource.com/c/1353878Reviewed-by: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611721}

components/browser_sync/profile_sync_service.h

@@ -236,8 +236,9 @@ class ProfileSyncService : public syncer::SyncService,
   void RemoveObserver(syncer::SyncServiceObserver* observer) override;
   bool HasObserver(const syncer::SyncServiceObserver* observer) const override;
   syncer::ModelTypeSet GetPreferredDataTypes() const override;
-  void OnUserChoseDatatypes(bool sync_everything,
-                            syncer::ModelTypeSet chosen_types) override;
+  // Virtual for testing.
+  virtual void OnUserChoseDatatypes(bool sync_everything,
+                                    syncer::ModelTypeSet chosen_types);
   virtual void SetFirstSetupComplete();  // Virtual for testing.
   std::unique_ptr<syncer::SyncSetupInProgressHandle> GetSetupInProgressHandle()
       override;

components/sync/driver/fake_sync_service.cc

@@ -73,9 +73,6 @@ ModelTypeSet FakeSyncService::GetPreferredDataTypes() const {
   return ModelTypeSet();
 }
 
-void FakeSyncService::OnUserChoseDatatypes(bool sync_everything,
-                                           ModelTypeSet chosen_types) {}
-
 std::unique_ptr<SyncSetupInProgressHandle>
 FakeSyncService::GetSetupInProgressHandle() {
   return nullptr;

components/sync/driver/fake_sync_service.h

@@ -40,8 +40,6 @@ class FakeSyncService : public SyncService {
   void OnDataTypeRequestsSyncStartup(ModelType type) override;
   void RequestStop(SyncService::SyncStopDataFate data_fate) override;
   ModelTypeSet GetPreferredDataTypes() const override;
-  void OnUserChoseDatatypes(bool sync_everything,
-                            ModelTypeSet chosen_types) override;
   std::unique_ptr<SyncSetupInProgressHandle> GetSetupInProgressHandle()
       override;
   bool IsSetupInProgress() const override;

components/sync/driver/sync_service.h

@@ -275,14 +275,6 @@ class SyncService : public DataTypeEncryptionHandler, public KeyedService {
   // told to MergeDataAndStartSyncing yet.
   virtual void OnDataTypeRequestsSyncStartup(ModelType type) = 0;
 
-  // Called when a user chooses which data types to sync. |sync_everything|
-  // represents whether they chose the "keep everything synced" option; if
-  // true, |chosen_types| will be ignored and all data types will be synced.
-  // |sync_everything| means "sync all current and future data types."
-  // |chosen_types| must be a subset of UserSelectableTypes().
-  virtual void OnUserChoseDatatypes(bool sync_everything,
-                                    ModelTypeSet chosen_types) = 0;
-
   // Triggers a GetUpdates call for the specified |types|, pulling any new data
   // from the sync server. Used by tests and debug UI (sync-internals).
   virtual void TriggerRefresh(const ModelTypeSet& types) = 0;

components/sync/driver/test_sync_service.cc

@@ -152,9 +152,6 @@ void TestSyncService::RequestStop(SyncService::SyncStopDataFate data_fate) {}
 
 void TestSyncService::OnDataTypeRequestsSyncStartup(ModelType type) {}
 
-void TestSyncService::OnUserChoseDatatypes(bool sync_everything,
-                                           ModelTypeSet chosen_types) {}
-
 void TestSyncService::TriggerRefresh(const ModelTypeSet& types) {}
 
 void TestSyncService::ReenableDatatype(ModelType type) {}

components/sync/driver/test_sync_service.h

@@ -62,8 +62,6 @@ class TestSyncService : public SyncService {
 
   void RequestStop(SyncStopDataFate data_fate) override;
   void OnDataTypeRequestsSyncStartup(ModelType type) override;
-  void OnUserChoseDatatypes(bool sync_everything,
-                            ModelTypeSet chosen_types) override;
   void TriggerRefresh(const ModelTypeSet& types) override;
   void ReenableDatatype(ModelType type) override;
   void ReadyForStartChanged(syncer::ModelType type) override;

components/sync/driver/test_sync_user_settings.cc

@@ -5,6 +5,7 @@
 #include "components/sync/driver/test_sync_user_settings.h"
 
 #include "components/sync/base/passphrase_enums.h"
+#include "components/sync/base/sync_prefs.h"
 #include "components/sync/driver/sync_service.h"
 #include "components/sync/driver/test_sync_service.h"
 
@@ -65,7 +66,14 @@ ModelTypeSet TestSyncUserSettings::GetChosenDataTypes() const {
 void TestSyncUserSettings::SetChosenDataTypes(bool sync_everything,
                                               ModelTypeSet types) {
   sync_everything_enabled_ = sync_everything;
-  service_->OnUserChoseDatatypes(sync_everything, types);
+  syncer::ModelTypeSet preferred_types;
+  if (sync_everything_enabled_) {
+    preferred_types = syncer::ModelTypeSet::All();
+  } else {
+    preferred_types = syncer::SyncPrefs::ResolvePrefGroups(
+        /*registered_types=*/syncer::ModelTypeSet::All(), types);
+  }
+  service_->SetPreferredDataTypes(preferred_types);
 }
 
 bool TestSyncUserSettings::IsEncryptEverythingAllowed() const {

components/unified_consent/unified_consent_service_unittest.cc

@@ -32,10 +32,6 @@ class TestSyncService : public syncer::TestSyncService {
   void AddObserver(syncer::SyncServiceObserver* observer) override {
     observer_ = observer;
   }
-  void OnUserChoseDatatypes(bool sync_everything,
-                            syncer::ModelTypeSet chosen_types) override {
-    SetPreferredDataTypes(chosen_types);
-  }
 
   void FireStateChanged() {
     if (observer_)