[Sync] Refactor data type configuration/activation/deactivation

chrome/browser/sync/profile_sync_service_mock.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_MOCK_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_MOCK_H_
 #pragma once
 
 #include <string>
 
@@ skipping 19 matching lines @@
   MOCK_METHOD4(OnUserSubmittedAuth,
                void(const std::string& username,
                     const std::string& password,
                     const std::string& captcha,
                     const std::string& access_code));
   MOCK_METHOD0(OnUserCancelledDialog, void());
   MOCK_CONST_METHOD0(GetAuthenticatedUsername, string16());
   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*));
   MOCK_METHOD1(RemoveObserver, void(Observer*));
   MOCK_METHOD0(GetJsController, base::WeakPtr<browser_sync::JsController>());
   MOCK_CONST_METHOD0(HasSyncSetupCompleted, bool());
 
   MOCK_METHOD1(ChangePreferredDataTypes,
                void(const syncable::ModelTypeSet& preferred_types));
   MOCK_CONST_METHOD1(GetPreferredDataTypes,
                      void(syncable::ModelTypeSet* preferred_types));
   MOCK_CONST_METHOD1(GetRegisteredDataTypes,
                      void(syncable::ModelTypeSet* registered_types));
   MOCK_CONST_METHOD0(GetLastSessionSnapshot,
                      const browser_sync::sessions::SyncSessionSnapshot*());
 
   MOCK_METHOD0(QueryDetailedSyncStatus,
                browser_sync::SyncBackendHost::Status());
   MOCK_CONST_METHOD0(GetLastSyncedTimeString, string16());
   MOCK_CONST_METHOD0(unrecoverable_error_detected, bool());
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_MOCK_H_