Refactor preference syncing.

chrome/browser/sync/glue/data_type_controller.h

Index: chrome/browser/sync/glue/data_type_controller.h
diff --git a/chrome/browser/sync/glue/data_type_controller.h b/chrome/browser/sync/glue/data_type_controller.h
index 31083109093bda94bf4a1108b4f09d3e87c5f87f..b34783cbe38ca86d3d41ab9ccb5e8c969f34c19a 100644
--- a/chrome/browser/sync/glue/data_type_controller.h
+++ b/chrome/browser/sync/glue/data_type_controller.h
@@ -18,6 +18,9 @@
 
 namespace browser_sync {
 
+class NewAssociatorInterface;
+class AssociatorInterface;
+
 // Data type controllers need to be refcounted threadsafe, as they may
 // need to run model associator or change processor on other threads.
 class DataTypeController
@@ -88,6 +91,13 @@ class DataTypeController
   // Current state of the data type controller.
   virtual State state() const = 0;
 
+  // TODO(zea): clean this up once all datatypes use the new associator
+  // interface.
+  // Getter/Setter for model associator. New model associators are created
+  // by their respective datatype services and then registered with the PSS,
+  // which then assigns them to their appropriate DataTypeController.
+  virtual NewAssociatorInterface* model_associator() const = 0;
+  virtual void set_model_associator(AssociatorInterface* associator) = 0;
  protected:
   friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
   friend class DeleteTask<DataTypeController>;