Reland r105404 with compile warning fixed.

chrome/browser/sync/profile_sync_factory_impl.h

Index: chrome/browser/sync/profile_sync_factory_impl.h
diff --git a/chrome/browser/sync/profile_sync_factory_impl.h b/chrome/browser/sync/profile_sync_factory_impl.h
index 5d8873bcd11bf41ff9788557a96dab4b0a1e4da6..27063a58fd581dfbc4425729085f284b30593a47 100644
--- a/chrome/browser/sync/profile_sync_factory_impl.h
+++ b/chrome/browser/sync/profile_sync_factory_impl.h
@@ -30,6 +30,13 @@ class ProfileSyncFactoryImpl : public ProfileSyncFactory {
       browser_sync::SyncBackendHost* backend,
       const browser_sync::DataTypeController::TypeMap* controllers);
 
+  virtual browser_sync::GenericChangeProcessor* CreateGenericChangeProcessor(
+      ProfileSyncService* profile_sync_service,
+      browser_sync::UnrecoverableErrorHandler* error_handler,
+      const base::WeakPtr<SyncableService>& local_service);
+
+  virtual browser_sync::SharedChangeProcessor* CreateSharedChangeProcessor();
+
   virtual SyncComponents CreateAppSyncComponents(
       ProfileSyncService* profile_sync_service,
       browser_sync::UnrecoverableErrorHandler* error_handler);
@@ -39,10 +46,8 @@ class ProfileSyncFactoryImpl : public ProfileSyncFactory {
       WebDatabase* web_database,
       browser_sync::UnrecoverableErrorHandler* error_handler);
 
-  virtual SyncComponents CreateAutofillProfileSyncComponents(
-      ProfileSyncService* profile_sync_service,
-      WebDataService* web_data_service,
-      browser_sync::UnrecoverableErrorHandler* error_handler);
+  virtual base::WeakPtr<SyncableService> GetAutofillProfileSyncableService(
+      WebDataService* web_data_service) const;
 
   virtual SyncComponents CreateBookmarkSyncComponents(
       ProfileSyncService* profile_sync_service,