chrome/browser/sync/profile_sync_factory_mock.h - Issue 8375047: Separate the syncing of extension settings and app settings into separate data

Side by Side Diff: chrome/browser/sync/profile_sync_factory_mock.h

Issue 8375047: Separate the syncing of extension settings and app settings into separate data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« chrome/browser/extensions/extension_settings_test_util.cc ('K') | « chrome/browser/sync/profile_sync_factory_impl.cc ('k') | chrome/browser/sync/protocol/app_setting_specifics.proto » ('j') | chrome/browser/sync/protocol/app_setting_specifics.proto » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_MOCK_H__	5 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_MOCK_H__

6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_MOCK_H__	6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_MOCK_H__

7 #pragma once	7 #pragma once

8	8

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "chrome/browser/sync/profile_sync_service.h"	10 #include "chrome/browser/sync/profile_sync_service.h"

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50 browser_sync::UnrecoverableErrorHandler* error_handler));	50 browser_sync::UnrecoverableErrorHandler* error_handler));

51 MOCK_CONST_METHOD1(GetAutofillProfileSyncableService,	51 MOCK_CONST_METHOD1(GetAutofillProfileSyncableService,

52 base::WeakPtr<SyncableService>(	52 base::WeakPtr<SyncableService>(

53 WebDataService* web_data_service));	53 WebDataService* web_data_service));

54 MOCK_METHOD2(CreateBookmarkSyncComponents,	54 MOCK_METHOD2(CreateBookmarkSyncComponents,

55 SyncComponents(ProfileSyncService* profile_sync_service,	55 SyncComponents(ProfileSyncService* profile_sync_service,

56 browser_sync::UnrecoverableErrorHandler* error_handler));	56 browser_sync::UnrecoverableErrorHandler* error_handler));

57 MOCK_METHOD2(CreateExtensionSyncComponents,	57 MOCK_METHOD2(CreateExtensionSyncComponents,

58 SyncComponents(ProfileSyncService* profile_sync_service,	58 SyncComponents(ProfileSyncService* profile_sync_service,

59 browser_sync::UnrecoverableErrorHandler* error_handler));	59 browser_sync::UnrecoverableErrorHandler* error_handler));

60 MOCK_METHOD3(CreateExtensionSettingSyncComponents,	60 MOCK_METHOD4(CreateExtensionOrAppSettingSyncComponents,

61 SyncComponents(ExtensionSettingsBackend* extension_settings_backend,	61 SyncComponents(syncable::ModelType model_type,

	62 SyncableService* settings_service,

62 ProfileSyncService* profile_sync_service,	63 ProfileSyncService* profile_sync_service,

63 browser_sync::UnrecoverableErrorHandler* error_handler));	64 browser_sync::UnrecoverableErrorHandler* error_handler));

64 MOCK_METHOD3(CreatePasswordSyncComponents,	65 MOCK_METHOD3(CreatePasswordSyncComponents,

65 SyncComponents(	66 SyncComponents(

66 ProfileSyncService* profile_sync_service,	67 ProfileSyncService* profile_sync_service,

67 PasswordStore* password_store,	68 PasswordStore* password_store,

68 browser_sync::UnrecoverableErrorHandler* error_handler));	69 browser_sync::UnrecoverableErrorHandler* error_handler));

69 MOCK_METHOD2(CreatePreferenceSyncComponents,	70 MOCK_METHOD2(CreatePreferenceSyncComponents,

70 SyncComponents(ProfileSyncService* profile_sync_service,	71 SyncComponents(ProfileSyncService* profile_sync_service,

71 browser_sync::UnrecoverableErrorHandler* error_handler));	72 browser_sync::UnrecoverableErrorHandler* error_handler));

(...skipping 18 matching lines...) Expand all Loading...
90 browser_sync::UnrecoverableErrorHandler* error_handler));	91 browser_sync::UnrecoverableErrorHandler* error_handler));

91	92

92 private:	93 private:

93 SyncComponents MakeSyncComponents();	94 SyncComponents MakeSyncComponents();

94	95

95 scoped_ptr<browser_sync::AssociatorInterface> model_associator_;	96 scoped_ptr<browser_sync::AssociatorInterface> model_associator_;

96 scoped_ptr<browser_sync::ChangeProcessor> change_processor_;	97 scoped_ptr<browser_sync::ChangeProcessor> change_processor_;

97 };	98 };

98	99

99 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_MOCK_H__	100 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_MOCK_H__

OLD	NEW