Reland r105404 with compile warning fixed.

chrome/browser/sync/profile_sync_factory_impl.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_IMPL_H__
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_IMPL_H__
 #pragma once
 
 #include <string>
 
@@ skipping 12 matching lines @@
   // ProfileSyncFactory interface.
   virtual ProfileSyncService* CreateProfileSyncService(
       const std::string& cros_user);
 
   virtual void RegisterDataTypes(ProfileSyncService* pss);
 
   virtual browser_sync::DataTypeManager* CreateDataTypeManager(
       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);
 
   virtual SyncComponents CreateAutofillSyncComponents(
       ProfileSyncService* profile_sync_service,
       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,
       browser_sync::UnrecoverableErrorHandler* error_handler);
 
   virtual SyncComponents CreateExtensionSettingSyncComponents(
       ExtensionSettingsBackend* extension_settings_backend,
       ProfileSyncService* profile_sync_service,
       browser_sync::UnrecoverableErrorHandler* error_handler);
 
@@ skipping 28 matching lines @@
       browser_sync::UnrecoverableErrorHandler* error_handler);
 
  private:
   Profile* profile_;
   CommandLine* command_line_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncFactoryImpl);
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_IMPL_H__