Reland r105404 with compile warning fixed.

chrome/browser/sync/glue/preference_data_type_controller.cc

Index: chrome/browser/sync/glue/preference_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/preference_data_type_controller.cc b/chrome/browser/sync/glue/preference_data_type_controller.cc
index 0e52b99b8a895bdc24254db6d0c9e5e7e559da58..c908ed3af82727e702b2b6bd987dd5db10e7dac5 100644
--- a/chrome/browser/sync/glue/preference_data_type_controller.cc
+++ b/chrome/browser/sync/glue/preference_data_type_controller.cc
@@ -7,7 +7,6 @@
 #include "base/metrics/histogram.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/api/syncable_service.h"
-#include "chrome/browser/sync/glue/generic_change_processor.h"
 #include "chrome/browser/sync/profile_sync_factory.h"
 
 namespace browser_sync {
@@ -33,7 +32,12 @@ void PreferenceDataTypeController::CreateSyncComponents() {
       profile_sync_factory_->CreatePreferenceSyncComponents(sync_service_,
                                                             this);
   set_model_associator(sync_components.model_associator);
-  set_change_processor(sync_components.change_processor);
+  generic_change_processor_.reset(static_cast<GenericChangeProcessor*>(
+      sync_components.change_processor));
+}
+
+GenericChangeProcessor* PreferenceDataTypeController::change_processor() const {
+  return generic_change_processor_.get();
 }
 
 void PreferenceDataTypeController::RecordUnrecoverableError(