Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/profile_sync_factory_impl.cc

Issue 8065016: [Sync] Refactor non-frontend DTC to handle new API properly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try harder trybot (rebase). Created 9 years, 2 months 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc ('K') | « chrome/browser/sync/profile_sync_factory_impl.h ('k') | chrome/browser/sync/profile_sync_factory_mock.h » ('j') | chrome/browser/sync/profile_sync_service_autofill_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_factory_impl.cc
diff --git a/chrome/browser/sync/profile_sync_factory_impl.cc b/chrome/browser/sync/profile_sync_factory_impl.cc
index 5f093e3810f03e83b86e558008482afa11f262e8..ce59885a294ebfd5ffdf89736f274bc54280af31 100644
--- a/chrome/browser/sync/profile_sync_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_factory_impl.cc
@@ -5,6 +5,7 @@
#include "base/command_line.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_settings_backend.h"
+#include "chrome/browser/prefs/pref_model_associator.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url_service.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
@@ -29,6 +30,7 @@
#include "chrome/browser/sync/glue/session_change_processor.h"
#include "chrome/browser/sync/glue/session_data_type_controller.h"
#include "chrome/browser/sync/glue/session_model_associator.h"
+#include "chrome/browser/sync/glue/shared_change_processor.h"
#include "chrome/browser/sync/glue/syncable_service_adapter.h"
#include "chrome/browser/sync/glue/sync_backend_host.h"
#include "chrome/browser/sync/glue/theme_change_processor.h"
@@ -69,6 +71,7 @@ using browser_sync::SearchEngineDataTypeController;
using browser_sync::SessionChangeProcessor;
using browser_sync::SessionDataTypeController;
using browser_sync::SessionModelAssociator;
+using browser_sync::SharedChangeProcessor;
using browser_sync::SyncableServiceAdapter;
using browser_sync::SyncBackendHost;
using browser_sync::ThemeChangeProcessor;
@@ -183,15 +186,31 @@ DataTypeManager* ProfileSyncFactoryImpl::CreateDataTypeManager(
return new DataTypeManagerImpl(backend, controllers);
}
+browser_sync::GenericChangeProcessor*
+ ProfileSyncFactoryImpl::CreateGenericChangeProcessor(
+ ProfileSyncService* profile_sync_service,
+ browser_sync::UnrecoverableErrorHandler* error_handler,
+ const base::WeakPtr<SyncableService>& local_service) {
+ sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
+ return new GenericChangeProcessor(error_handler,
+ local_service,
+ user_share);
+}
+
+browser_sync::SharedChangeProcessor* ProfileSyncFactoryImpl::
+ CreateSharedChangeProcessor() {
+ return new SharedChangeProcessor();
+}
+
ProfileSyncFactory::SyncComponents
ProfileSyncFactoryImpl::CreateAppSyncComponents(
ProfileSyncService* profile_sync_service,
UnrecoverableErrorHandler* error_handler) {
- SyncableService* app_sync_service =
- profile_sync_service->profile()->GetExtensionService();
+ base::WeakPtr<SyncableService> app_sync_service =
+ profile_sync_service->profile()->GetExtensionService()->AsWeakPtr();
sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
GenericChangeProcessor* change_processor =
- new GenericChangeProcessor(app_sync_service, error_handler, user_share);
+ new GenericChangeProcessor(error_handler, app_sync_service, user_share);
browser_sync::SyncableServiceAdapter* sync_service_adapter =
new browser_sync::SyncableServiceAdapter(syncable::APPS,
app_sync_service,
@@ -217,21 +236,12 @@ ProfileSyncFactoryImpl::CreateAutofillSyncComponents(
return SyncComponents(model_associator, change_processor);
}
-ProfileSyncFactory::SyncComponents
-ProfileSyncFactoryImpl::CreateAutofillProfileSyncComponents(
- ProfileSyncService* profile_sync_service,
- WebDataService* web_data_service,
- browser_sync::UnrecoverableErrorHandler* error_handler) {
- AutofillProfileSyncableService* sync_service =
- new AutofillProfileSyncableService(web_data_service);
- sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
- GenericChangeProcessor* change_processor =
- new GenericChangeProcessor(sync_service, error_handler, user_share);
- browser_sync::SyncableServiceAdapter* sync_service_adapter =
- new browser_sync::SyncableServiceAdapter(syncable::AUTOFILL_PROFILE,
- sync_service,
- change_processor);
- return SyncComponents(sync_service_adapter, change_processor);
+base::WeakPtr<SyncableService>
+ProfileSyncFactoryImpl::GetAutofillProfileSyncableService(
+ WebDataService* web_data_service) {
+ // TODO(isherman): This currently leaks at sync shutdown since the sync
akalin 2011/10/12 19:54:21 rebase?
Nicolas Zea 2011/10/12 23:47:43 Done.
+ // datatype controller doesn't own it. See crbug.com/96922.
+ return (new AutofillProfileSyncableService(web_data_service))->AsWeakPtr();
}
ProfileSyncFactory::SyncComponents
@@ -259,10 +269,9 @@ ProfileSyncFactoryImpl::CreateExtensionSettingSyncComponents(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
GenericChangeProcessor* change_processor =
- new GenericChangeProcessor(
- extension_settings_backend,
- error_handler,
- user_share);
+ new GenericChangeProcessor(error_handler,
+ extension_settings_backend->AsWeakPtr(),
+ user_share);
browser_sync::SyncableServiceAdapter* sync_service_adapter =
new browser_sync::SyncableServiceAdapter(syncable::EXTENSION_SETTINGS,
extension_settings_backend,
@@ -274,12 +283,13 @@ ProfileSyncFactory::SyncComponents
ProfileSyncFactoryImpl::CreateExtensionSyncComponents(
ProfileSyncService* profile_sync_service,
UnrecoverableErrorHandler* error_handler) {
- SyncableService* extension_sync_service =
- profile_sync_service->profile()->GetExtensionService();
+ base::WeakPtr<SyncableService> extension_sync_service =
+ profile_sync_service->profile()->GetExtensionService()->AsWeakPtr();
sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
GenericChangeProcessor* change_processor =
- new GenericChangeProcessor(extension_sync_service, error_handler,
- user_share);
+ new GenericChangeProcessor(error_handler,
+ extension_sync_service,
+ user_share);
browser_sync::SyncableServiceAdapter* sync_service_adapter =
new browser_sync::SyncableServiceAdapter(syncable::EXTENSIONS,
extension_sync_service,
@@ -306,11 +316,13 @@ ProfileSyncFactory::SyncComponents
ProfileSyncFactoryImpl::CreatePreferenceSyncComponents(
ProfileSyncService* profile_sync_service,
UnrecoverableErrorHandler* error_handler) {
- SyncableService* pref_sync_service =
- profile_->GetPrefs()->GetSyncableService();
+ base::WeakPtr<SyncableService> pref_sync_service =
+ profile_->GetPrefs()->GetSyncableService()->AsWeakPtr();
sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
GenericChangeProcessor* change_processor =
- new GenericChangeProcessor(pref_sync_service, error_handler, user_share);
+ new GenericChangeProcessor(error_handler,
+ pref_sync_service,
+ user_share);
SyncableServiceAdapter* sync_service_adapter =
new SyncableServiceAdapter(syncable::PREFERENCES,
pref_sync_service,
@@ -360,12 +372,14 @@ ProfileSyncFactory::SyncComponents
ProfileSyncFactoryImpl::CreateSearchEngineSyncComponents(
ProfileSyncService* profile_sync_service,
UnrecoverableErrorHandler* error_handler) {
- SyncableService* se_sync_service =
- TemplateURLServiceFactory::GetForProfile(profile_);
+ base::WeakPtr<SyncableService> se_sync_service =
+ TemplateURLServiceFactory::GetForProfile(profile_)->AsWeakPtr();
DCHECK(se_sync_service);
sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
GenericChangeProcessor* change_processor =
- new GenericChangeProcessor(se_sync_service, error_handler, user_share);
+ new GenericChangeProcessor(error_handler,
+ se_sync_service,
+ user_share);
SyncableServiceAdapter* sync_service_adapter =
new SyncableServiceAdapter(syncable::SEARCH_ENGINES,
se_sync_service,
« chrome/browser/sync/glue/new_non_frontend_data_type_controller.cc ('K') | « chrome/browser/sync/profile_sync_factory_impl.h ('k') | chrome/browser/sync/profile_sync_factory_mock.h » ('j') | chrome/browser/sync/profile_sync_service_autofill_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698