Reland r105404 with compile warning fixed.

chrome/browser/sync/glue/preference_data_type_controller.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_GLUE_PREFERENCE_DATA_TYPE_CONTROLLER_H__
 #define CHROME_BROWSER_SYNC_GLUE_PREFERENCE_DATA_TYPE_CONTROLLER_H__
 #pragma once
 
 #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 {
 
 class PreferenceDataTypeController : public FrontendDataTypeController {
  public:
   PreferenceDataTypeController(
       ProfileSyncFactory* profile_sync_factory,
       Profile* profile,
       ProfileSyncService* sync_service);
   virtual ~PreferenceDataTypeController();
 
   // FrontendDataTypeController implementation.
   virtual syncable::ModelType type() const OVERRIDE;
 
+ protected:
+  virtual GenericChangeProcessor* change_processor() const OVERRIDE;
+
  private:
   // FrontendDataTypeController implementations.
   virtual void CreateSyncComponents() OVERRIDE;
   virtual void RecordUnrecoverableError(
       const tracked_objects::Location& from_here,
       const std::string& message) OVERRIDE;
   virtual void RecordAssociationTime(base::TimeDelta time) OVERRIDE;
   virtual void RecordStartFailure(StartResult result) OVERRIDE;
 
+  scoped_ptr<GenericChangeProcessor> generic_change_processor_;
+
   DISALLOW_COPY_AND_ASSIGN(PreferenceDataTypeController);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_PREFERENCE_DATA_TYPE_CONTROLLER_H__