Reland r105404 with compile warning fixed.

chrome/browser/sync/profile_sync_service_preference_unittest.cc

Index: chrome/browser/sync/profile_sync_service_preference_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
index 1c5b08e1f2a6e3b80ff1c2912079bcb6eb92ecb1..4299d6345e725f5a6cda97b6e604ca0c11c2d396 100644
--- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
@@ -50,9 +50,10 @@ typedef std::map<const std::string, const Value*> PreferenceValues;
 ACTION_P4(BuildPrefSyncComponents, profile_sync_service, pref_sync_service,
     model_associator_ptr, change_processor_ptr) {
   sync_api::UserShare* user_share = profile_sync_service->GetUserShare();
-  *change_processor_ptr = new GenericChangeProcessor(pref_sync_service,
-                                 profile_sync_service,
-                                 user_share);
+  *change_processor_ptr = new GenericChangeProcessor(
+      profile_sync_service,
+      pref_sync_service->AsWeakPtr(),
+      user_share);
   *model_associator_ptr = new browser_sync::SyncableServiceAdapter(
       syncable::PREFERENCES,
       pref_sync_service,