Refactor preference syncing.

chrome/browser/sync/glue/frontend_data_type_controller.h

Index: chrome/browser/sync/glue/frontend_data_type_controller.h
diff --git a/chrome/browser/sync/glue/frontend_data_type_controller.h b/chrome/browser/sync/glue/frontend_data_type_controller.h
index 6a2d86313abf9ce7c5d08a33558676eeefe43b74..21c02427d1d1fddf218d2e9c6bd1cad38274660d 100644
--- a/chrome/browser/sync/glue/frontend_data_type_controller.h
+++ b/chrome/browser/sync/glue/frontend_data_type_controller.h
@@ -19,7 +19,7 @@ class ProfileSyncFactory;
 namespace base { class TimeDelta; }
 namespace browser_sync {
 
-class AssociatorInterface;
+class NewAssociatorInterface;
 class ChangeProcessor;
 
 // TODO(zea): have naming and style match NonFrontendDataTypeController.
@@ -51,10 +51,13 @@ class FrontendDataTypeController : public DataTypeController {
   virtual browser_sync::ModelSafeGroup model_safe_group() const;
   virtual std::string name() const;
   virtual State state() const;
+  virtual NewAssociatorInterface* model_associator() const;
+  virtual void set_model_associator(AssociatorInterface* associator);
 
   // UnrecoverableErrorHandler interface.
   virtual void OnUnrecoverableError(const tracked_objects::Location& from_here,
                                     const std::string& message);
+
  protected:
   // For testing only.
   FrontendDataTypeController();
@@ -107,7 +110,7 @@ class FrontendDataTypeController : public DataTypeController {
   State state_;
 
   scoped_ptr<StartCallback> start_callback_;
-  scoped_ptr<AssociatorInterface> model_associator_;
+  scoped_refptr<NewAssociatorInterface> model_associator_;
   scoped_ptr<ChangeProcessor> change_processor_;
 
   DISALLOW_COPY_AND_ASSIGN(FrontendDataTypeController);