[Sync] Refactor data type configuration/activation/deactivation

chrome/browser/sync/profile_sync_service.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 371 matching lines @@
   // Get the current routing information for all enabled model types.
   // If a model type is not enabled (that is, if the syncer should not
   // be trying to sync it), it is not in this map.
   //
   // TODO(akalin): This function is used by
   // sync_ui_util::ConstructAboutInformation() and by some test
   // classes.  Figure out a different way to expose this info and
   // remove this function.
   void GetModelSafeRoutingInfo(browser_sync::ModelSafeRoutingInfo* out);
 
+  // Overridden by tests.
   // TODO(zea): Remove these and have the dtc's call directly into the SBH.
   virtual void ActivateDataType(
-      browser_sync::DataTypeController* data_type_controller,
+      syncable::ModelType type, browser_sync::ModelSafeGroup group,
       browser_sync::ChangeProcessor* change_processor);
-  virtual void DeactivateDataType(
-      browser_sync::DataTypeController* data_type_controller,
-      browser_sync::ChangeProcessor* change_processor);
+  virtual void DeactivateDataType(syncable::ModelType type);

[tim (not reviewing), 2011/08/10 23:39:08]

See that todo up there? ;)

[akalin, 2011/08/10 23:41:49]

Future CL.  If I remove these, then I'd have to somehow get the backend to the
DTCs *and* fix tests.  This is already a yak. :(

 
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Changes which data types we're going to be syncing to |preferred_types|.
   // If it is running, the DataTypeManager will be instructed to reconfigure
   // the sync backend so that exactly these datatypes are actively synced.  See
   // class comment for more on what it means for a datatype to be Preferred.
@@ skipping 232 matching lines @@
   // and cached until the syncer either finishes encryption
   // (OnEncryptionComplete) or the user cancels.
   syncable::ModelTypeSet pending_types_for_encryption_;
 
   scoped_ptr<browser_sync::BackendMigrator> migrator_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_