[Sync] Refactor data type configuration/activation/deactivation

chrome/browser/sync/profile_sync_service_mock.h

Index: chrome/browser/sync/profile_sync_service_mock.h
diff --git a/chrome/browser/sync/profile_sync_service_mock.h b/chrome/browser/sync/profile_sync_service_mock.h
index 69785ffb51b734d90aad3280e983bee4b4f8a431..0c81c9c79978ef4fe08f679cfdc79dea6256a5c0 100644
--- a/chrome/browser/sync/profile_sync_service_mock.h
+++ b/chrome/browser/sync/profile_sync_service_mock.h
@@ -37,12 +37,10 @@ class ProfileSyncServiceMock : public ProfileSyncService {
   MOCK_METHOD2(OnUnrecoverableError,
                void(const tracked_objects::Location& location,
                const std::string& message));
-  MOCK_METHOD2(ActivateDataType,
-               void(browser_sync::DataTypeController* data_type_controller,
-                    browser_sync::ChangeProcessor* change_processor));
-  MOCK_METHOD2(DeactivateDataType,
-               void(browser_sync::DataTypeController* data_type_controller,
-                    browser_sync::ChangeProcessor* change_processor));
+  MOCK_METHOD3(ActivateDataType,
+               void(syncable::ModelType, browser_sync::ModelSafeGroup,
+                    browser_sync::ChangeProcessor*));
+  MOCK_METHOD1(DeactivateDataType, void(syncable::ModelType));
 
   MOCK_METHOD0(InitializeBackend, void());
   MOCK_METHOD1(AddObserver, void(Observer*));