USS SyncContextProxy / data type activation refactoring

sync/internal_api/sync_context_proxy_impl.h

Index: sync/internal_api/sync_context_proxy_impl.h
diff --git a/sync/internal_api/sync_context_proxy_impl.h b/sync/internal_api/sync_context_proxy_impl.h
index 9d2ac8dce9d57e499869401266feaad86cf080d4..2dc9923dc3dabf2092d91c5d87f151701e062915 100644
--- a/sync/internal_api/sync_context_proxy_impl.h
+++ b/sync/internal_api/sync_context_proxy_impl.h
@@ -13,9 +13,7 @@
 #include "sync/internal_api/public/sync_context_proxy.h"
 
 namespace syncer_v2 {
-class ModelTypeProcessor;
 class SyncContext;
-struct DataTypeState;
 
 // Encapsulates a reference to the sync context and the thread it's running on.
 // Used by sync's data types to connect with the sync context.
@@ -34,13 +32,9 @@ class SYNC_EXPORT_PRIVATE SyncContextProxyImpl : public SyncContextProxy {
   // This may fail under some unusual circumstances, like shutdown.  Due to the
   // nature of WeakPtrs and cross-thread communication, the caller will be
   // unable to distinguish a slow success from failure.
-  //
-  // Must be called from the thread where the data type lives.
   void ConnectTypeToSync(
       syncer::ModelType type,
-      const DataTypeState& data_type_state,
-      const UpdateResponseDataList& pending_updates,
-      const base::WeakPtr<ModelTypeProcessor>& type_processor) override;
+      scoped_ptr<ActivationContext> activation_context) override;
 
   // Disables syncing for the given type on the sync thread.
   void Disconnect(syncer::ModelType type) override;