Index: chrome/browser/sync/profile_sync_service.cc |
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc |
index 70da3a19e2d0de4d545dae269a84b726a73b321b..50666f92408f05dfa8b6b9e0611b0fb8de05f5dc 100644 |
--- a/chrome/browser/sync/profile_sync_service.cc |
+++ b/chrome/browser/sync/profile_sync_service.cc |
@@ -6,7 +6,6 @@ |
#include <stddef.h> |
#include <map> |
-#include <ostream> |
#include <set> |
#include <utility> |
@@ -315,7 +314,6 @@ void ProfileSyncService::RegisterPreferences() { |
pref_service->RegisterStringPref(prefs::kEncryptionBootstrapToken, |
"", |
PrefService::UNSYNCABLE_PREF); |
- |
pref_service->RegisterBooleanPref(prefs::kSyncAutofillProfile, |
enable_by_default, |
PrefService::UNSYNCABLE_PREF); |
@@ -381,6 +379,7 @@ void ProfileSyncService::InitializeBackend(bool delete_sync_data_folder) { |
backend_->Initialize( |
this, |
+ factory_, |
WeakHandle<JsEventHandler>(sync_js_controller_.AsWeakPtr()), |
sync_service_url_, |
initial_types, |
@@ -1106,7 +1105,7 @@ void ProfileSyncService::ConfigureDataTypeManager() { |
restart = true; |
data_type_manager_.reset( |
factory_->CreateDataTypeManager(backend_.get(), |
- data_type_controllers_)); |
+ &data_type_controllers_)); |
registrar_.Add(this, |
chrome::NOTIFICATION_SYNC_CONFIGURE_START, |
Source<DataTypeManager>(data_type_manager_.get())); |