Refactor preference syncing.

chrome/browser/sync/profile_sync_factory_mock.h

Index: chrome/browser/sync/profile_sync_factory_mock.h
diff --git a/chrome/browser/sync/profile_sync_factory_mock.h b/chrome/browser/sync/profile_sync_factory_mock.h
index 3fa856c84517568022b1bb96fd2b532470e6822b..b94c6530ee24070a1550f420f70e32ab92436856 100644
--- a/chrome/browser/sync/profile_sync_factory_mock.h
+++ b/chrome/browser/sync/profile_sync_factory_mock.h
@@ -6,13 +6,14 @@
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_FACTORY_MOCK_H__
 #pragma once
 
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace browser_sync {
-class AssociatorInterface;
+class NewAssociatorInterface;
 class ChangeProcessor;
 }
 
@@ -20,7 +21,7 @@ class ProfileSyncFactoryMock : public ProfileSyncFactory {
  public:
   ProfileSyncFactoryMock();
   ProfileSyncFactoryMock(
-      browser_sync::AssociatorInterface* bookmark_model_associator,
+      browser_sync::NewAssociatorInterface* bookmark_model_associator,
       browser_sync::ChangeProcessor* bookmark_change_processor);
   virtual ~ProfileSyncFactoryMock();
 
@@ -75,7 +76,7 @@ class ProfileSyncFactoryMock : public ProfileSyncFactory {
  private:
   SyncComponents MakeBookmarkSyncComponents();
 
-  scoped_ptr<browser_sync::AssociatorInterface> bookmark_model_associator_;
+  browser_sync::NewAssociatorInterface* bookmark_model_associator_;
   scoped_ptr<browser_sync::ChangeProcessor> bookmark_change_processor_;
 };