Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync / profile_sync_service_mock.h

diff --git a/src/chrome/browser/sync/profile_sync_service_mock.h b/src/chrome/browser/sync/profile_sync_service_mock.h
index 15eb0ee..b6d8ae8 100644 (file)
--- a/src/chrome/browser/sync/profile_sync_service_mock.h
+++ b/src/chrome/browser/sync/profile_sync_service_mock.h
@@ -10,10 +10,10 @@
 
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
-#include "chrome/browser/sync/glue/change_processor.h"
 #include "chrome/browser/sync/glue/device_info.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/sync_driver/change_processor.h"
 #include "components/sync_driver/data_type_controller.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "sync/internal_api/public/base/model_type.h"
@@ -61,9 +61,6 @@ class ProfileSyncServiceMock : public ProfileSyncService {
                const tracked_objects::Location&,
                std::string message));
   MOCK_CONST_METHOD0(GetUserShare, syncer::UserShare*());
-  MOCK_METHOD3(ActivateDataType,
-               void(syncer::ModelType, syncer::ModelSafeGroup,
-                    browser_sync::ChangeProcessor*));
   MOCK_METHOD1(DeactivateDataType, void(syncer::ModelType));
   MOCK_METHOD0(UnsuppressAndStart, void());
 
@@ -97,8 +94,6 @@ class ProfileSyncServiceMock : public ProfileSyncService {
   MOCK_METHOD1(SetSetupInProgress, void(bool));
   MOCK_CONST_METHOD0(IsSessionsDataTypeControllerRunning, bool());
 
-  MOCK_METHOD0(GetSessionModelAssociatorDeprecated,
-               browser_sync::SessionModelAssociator*());
   MOCK_CONST_METHOD0(GetAllSignedInDevicesMock,
                      std::vector<browser_sync::DeviceInfo*>* ());
   // This is to get around the fact that GMOCK does not handle Scoped*.