Rest of the autofill work.

chrome/browser/sync/profile_sync_factory_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/app_data_type_controller.h"
 #include "chrome/browser/sync/glue/autofill_change_processor.h"
 #include "chrome/browser/sync/glue/autofill_change_processor2.h"
+#include "chrome/browser/sync/glue/autofill_profile_change_processor.h"
 #include "chrome/browser/sync/glue/autofill_data_type_controller.h"
+#include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h"

[tim (not reviewing), 2010/12/13 19:24:33]

alphabetical

[lipalani, 2010/12/15 09:08:33]

Done.

 #include "chrome/browser/sync/glue/autofill_model_associator.h"
 #include "chrome/browser/sync/glue/autofill_model_associator2.h"
+#include "chrome/browser/sync/glue/autofill_profile_model_associator.h"
 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"
 #include "chrome/browser/sync/glue/bookmark_model_associator.h"
 #include "chrome/browser/sync/glue/data_type_manager_impl.h"
 #include "chrome/browser/sync/glue/extension_change_processor.h"
 #include "chrome/browser/sync/glue/extension_data_type_controller.h"
 #include "chrome/browser/sync/glue/extension_model_associator.h"
 #include "chrome/browser/sync/glue/extension_sync_traits.h"
 #include "chrome/browser/sync/glue/password_change_processor.h"
 #include "chrome/browser/sync/glue/password_data_type_controller.h"
 #include "chrome/browser/sync/glue/password_model_associator.h"
 #include "chrome/browser/sync/glue/preference_change_processor.h"
 #include "chrome/browser/sync/glue/preference_data_type_controller.h"
 #include "chrome/browser/sync/glue/preference_model_associator.h"
 #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/sync_backend_host.h"
 #include "chrome/browser/sync/glue/theme_change_processor.h"
 #include "chrome/browser/sync/glue/theme_data_type_controller.h"
 #include "chrome/browser/sync/glue/theme_model_associator.h"
 #include "chrome/browser/sync/glue/typed_url_change_processor.h"
 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h"
 #include "chrome/browser/sync/glue/typed_url_model_associator.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_factory_impl.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/pref_names.h"
 
 using browser_sync::AppDataTypeController;
 using browser_sync::AutofillChangeProcessor;
 using browser_sync::AutofillChangeProcessor2;
+using browser_sync::AutofillProfileChangeProcessor;
 using browser_sync::AutofillDataTypeController;
+using browser_sync::AutofillProfileDataTypeController;
 using browser_sync::AutofillModelAssociator;
 using browser_sync::AutofillModelAssociator2;
+using browser_sync::AutofillProfileModelAssociator;
 using browser_sync::BookmarkChangeProcessor;
 using browser_sync::BookmarkDataTypeController;
 using browser_sync::BookmarkModelAssociator;
 using browser_sync::DataTypeController;
 using browser_sync::DataTypeManager;
 using browser_sync::DataTypeManagerImpl;
 using browser_sync::ExtensionChangeProcessor;
 using browser_sync::ExtensionDataTypeController;
 using browser_sync::ExtensionModelAssociator;
 using browser_sync::PasswordChangeProcessor;
@@ skipping 80 matching lines @@
     pss->RegisterDataTypeController(
         new TypedUrlDataTypeController(this, profile_, pss));
   }
 
   // Session sync is disabled by default.  Register only if explicitly
   // enabled.
   if (command_line_->HasSwitch(switches::kEnableSyncSessions)) {
     pss->RegisterDataTypeController(
         new SessionDataTypeController(this, pss));
   }
+
+  if (!command_line_->HasSwitch(switches::kDisableSyncAutofillProfile) &&
+      command_line_->HasSwitch(switches::kEnableSyncNewAutofill)) {
+    pss->RegisterDataTypeController(new AutofillProfileDataTypeController(
+        this, profile_, pss));
+  }
   return pss;
 }
 
 DataTypeManager* ProfileSyncFactoryImpl::CreateDataTypeManager(
     SyncBackendHost* backend,
     const DataTypeController::TypeMap& controllers) {
   return new DataTypeManagerImpl(backend, controllers);
 }
 
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreateAppSyncComponents(
     ProfileSyncService* profile_sync_service,
     UnrecoverableErrorHandler* error_handler) {
   browser_sync::ExtensionSyncTraits traits = browser_sync::GetAppSyncTraits();
   // For now we simply use extensions sync objects with the app sync
   // traits.  If apps become more than simply extensions, we may have
   // to write our own apps model associator and/or change processor.
   ExtensionModelAssociator* model_associator =
       new ExtensionModelAssociator(traits, profile_sync_service);
   ExtensionChangeProcessor* change_processor =
       new ExtensionChangeProcessor(traits, error_handler);
   return SyncComponents(model_associator, change_processor);
 }
 
+

[tim (not reviewing), 2010/12/13 19:24:33]

extra newlines

[lipalani, 2010/12/14 21:05:57]

Done.

+
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreateAutofillSyncComponents(
     ProfileSyncService* profile_sync_service,
     WebDatabase* web_database,
     PersonalDataManager* personal_data,
     browser_sync::UnrecoverableErrorHandler* error_handler) {
 
   if (command_line_->HasSwitch(switches::kEnableSyncNewAutofill)) {
     AutofillModelAssociator* model_associator =
         new AutofillModelAssociator(profile_sync_service,
@@ skipping 13 matching lines @@
     AutofillChangeProcessor2* change_processor =
         new AutofillChangeProcessor2(model_associator,
                                     web_database,
                                     personal_data,
                                     error_handler);
     return SyncComponents(model_associator, change_processor);
   }
 }
 
 ProfileSyncFactory::SyncComponents
+ProfileSyncFactoryImpl::CreateAutofillProfileSyncComponents(
+    ProfileSyncService* profile_sync_service,
+    WebDatabase* web_database,
+    PersonalDataManager* personal_data,
+    browser_sync::UnrecoverableErrorHandler* error_handler) {
+
+  AutofillProfileModelAssociator* model_associator =
+      new AutofillProfileModelAssociator(profile_sync_service,
+                                  web_database,
+                                  personal_data);
+  AutofillProfileChangeProcessor* change_processor =
+      new AutofillProfileChangeProcessor(model_associator,
+                                  web_database,
+                                  personal_data,
+                                  error_handler);
+  return SyncComponents(model_associator, change_processor);
+}
+
+ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreateBookmarkSyncComponents(
     ProfileSyncService* profile_sync_service,
     UnrecoverableErrorHandler* error_handler) {
   BookmarkModelAssociator* model_associator =
       new BookmarkModelAssociator(profile_sync_service,
                                   error_handler);
   BookmarkChangeProcessor* change_processor =
       new BookmarkChangeProcessor(model_associator,
                                   error_handler);
   return SyncComponents(model_associator, change_processor);
@@ skipping 68 matching lines @@
 ProfileSyncFactory::SyncComponents
 ProfileSyncFactoryImpl::CreateSessionSyncComponents(
     ProfileSyncService* profile_sync_service,
     UnrecoverableErrorHandler* error_handler) {
   SessionModelAssociator* model_associator =
       new SessionModelAssociator(profile_sync_service);
   SessionChangeProcessor* change_processor =
       new SessionChangeProcessor(error_handler, model_associator);
   return SyncComponents(model_associator, change_processor);
 }