Reland r105404 with compile warning fixed.

chrome/browser/sync/profile_sync_factory_mock.h

Index: chrome/browser/sync/profile_sync_factory_mock.h
diff --git a/chrome/browser/sync/profile_sync_factory_mock.h b/chrome/browser/sync/profile_sync_factory_mock.h
index 5bb54454fac2c2aaa069af4490a8db6ecd1b0dd7..efbb7b936e9f0c8ed3e993573426f3b3bf5670d0 100644
--- a/chrome/browser/sync/profile_sync_factory_mock.h
+++ b/chrome/browser/sync/profile_sync_factory_mock.h
@@ -33,6 +33,13 @@ class ProfileSyncFactoryMock : public ProfileSyncFactory {
                browser_sync::DataTypeManager*(
                    browser_sync::SyncBackendHost*,
                    const browser_sync::DataTypeController::TypeMap*));
+  MOCK_METHOD3(CreateGenericChangeProcessor,
+      browser_sync::GenericChangeProcessor*(
+          ProfileSyncService* profile_sync_service,
+          browser_sync::UnrecoverableErrorHandler* error_handler,
+          const base::WeakPtr<SyncableService>& local_service));
+  MOCK_METHOD0(CreateSharedChangeProcessor,
+      browser_sync::SharedChangeProcessor*());
   MOCK_METHOD2(CreateAppSyncComponents,
       SyncComponents(ProfileSyncService* profile_sync_service,
                      browser_sync::UnrecoverableErrorHandler* error_handler));
@@ -41,11 +48,9 @@ class ProfileSyncFactoryMock : public ProfileSyncFactory {
                    ProfileSyncService* profile_sync_service,
                    WebDatabase* web_database,
                    browser_sync::UnrecoverableErrorHandler* error_handler));
-  MOCK_METHOD3(CreateAutofillProfileSyncComponents,
-               SyncComponents(
-                   ProfileSyncService* profile_sync_service,
-                   WebDataService* web_data_service,
-                   browser_sync::UnrecoverableErrorHandler* error_handler));
+  MOCK_CONST_METHOD1(GetAutofillProfileSyncableService,
+                     base::WeakPtr<SyncableService>(
+                         WebDataService* web_data_service));
   MOCK_METHOD2(CreateBookmarkSyncComponents,
       SyncComponents(ProfileSyncService* profile_sync_service,
                      browser_sync::UnrecoverableErrorHandler* error_handler));