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

Unified Diff: components/browser_sync/profile_sync_components_factory_impl.cc

Issue 2672493002: [Sync] Switch bots to run integ tests for autofill as USS. (Closed)
Patch Set: Updated for Gang's comment. Created 3 years, 10 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
Index: components/browser_sync/profile_sync_components_factory_impl.cc
diff --git a/components/browser_sync/profile_sync_components_factory_impl.cc b/components/browser_sync/profile_sync_components_factory_impl.cc
index 2d933196b3b9b5cd70f4e91afa81cae212545301..c5f9a8ddbeb740cb86edf62c20b02932424e4c2c 100644
--- a/components/browser_sync/profile_sync_components_factory_impl.cc
+++ b/components/browser_sync/profile_sync_components_factory_impl.cc
@@ -11,9 +11,11 @@
#include "base/memory/ref_counted.h"
#include "build/build_config.h"
#include "components/autofill/core/browser/autofill_wallet_data_type_controller.h"
+#include "components/autofill/core/browser/webdata/autocomplete_sync_bridge.h"
#include "components/autofill/core/browser/webdata/autofill_data_type_controller.h"
#include "components/autofill/core/browser/webdata/autofill_profile_data_type_controller.h"
#include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
+#include "components/autofill/core/browser/webdata/web_data_model_type_controller.h"
#include "components/autofill/core/common/autofill_pref_names.h"
#include "components/autofill/core/common/autofill_switches.h"
#include "components/browser_sync/browser_sync_switches.h"
@@ -155,8 +157,10 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
if (!disabled_types.Has(syncer::AUTOFILL)) {
if (base::FeatureList::IsEnabled(switches::kSyncUSSAutocomplete)) {
sync_service->RegisterDataTypeController(
- base::MakeUnique<ModelTypeController>(syncer::AUTOFILL, sync_client_,
- db_thread_));
+ base::MakeUnique<autofill::WebDataModelTypeController>(
+ syncer::AUTOFILL, sync_client_, db_thread_, web_data_service_,
+ base::Bind(
+ &autofill::AutocompleteSyncBridge::FromWebDataService)));
} else {
sync_service->RegisterDataTypeController(
base::MakeUnique<AutofillDataTypeController>(

Powered by Google App Engine
This is Rietveld 408576698