Reland r105404 with compile warning fixed.

chrome/browser/sync/glue/preference_data_type_controller.h

Index: chrome/browser/sync/glue/preference_data_type_controller.h
diff --git a/chrome/browser/sync/glue/preference_data_type_controller.h b/chrome/browser/sync/glue/preference_data_type_controller.h
index 6f3d009ab685e69c1f25a2923d4dfc9dcfcffac9..86f89c1c9fcb95ce9d92086f8212f45a4c93a7d9 100644
--- a/chrome/browser/sync/glue/preference_data_type_controller.h
+++ b/chrome/browser/sync/glue/preference_data_type_controller.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "chrome/browser/sync/glue/generic_change_processor.h"
 #include "chrome/browser/sync/glue/frontend_data_type_controller.h"
 
 namespace browser_sync {
@@ -24,6 +25,9 @@ class PreferenceDataTypeController : public FrontendDataTypeController {
   // FrontendDataTypeController implementation.
   virtual syncable::ModelType type() const OVERRIDE;
 
+ protected:
+  virtual GenericChangeProcessor* change_processor() const OVERRIDE;
+
  private:
   // FrontendDataTypeController implementations.
   virtual void CreateSyncComponents() OVERRIDE;
@@ -33,6 +37,8 @@ class PreferenceDataTypeController : public FrontendDataTypeController {
   virtual void RecordAssociationTime(base::TimeDelta time) OVERRIDE;
   virtual void RecordStartFailure(StartResult result) OVERRIDE;
 
+  scoped_ptr<GenericChangeProcessor> generic_change_processor_;
+
   DISALLOW_COPY_AND_ASSIGN(PreferenceDataTypeController);
 };