USS SyncContextProxy / data type activation refactoring

sync/internal_api/public/sync_context_proxy.h

Index: sync/internal_api/public/sync_context_proxy.h
diff --git a/sync/internal_api/public/sync_context_proxy.h b/sync/internal_api/public/sync_context_proxy.h
index 5d20be96c2849127d1a42a5a5aa1f3e678372d0a..de6de251677abbd9f06d01e1589e7535d276f526 100644
--- a/sync/internal_api/public/sync_context_proxy.h
+++ b/sync/internal_api/public/sync_context_proxy.h
@@ -5,12 +5,11 @@
 #ifndef SYNC_INTERNAL_API_PUBLIC_SYNC_CONTEXT_PROXY_H_
 #define SYNC_INTERNAL_API_PUBLIC_SYNC_CONTEXT_PROXY_H_
 
-#include "base/memory/weak_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "sync/internal_api/public/base/model_type.h"
-#include "sync/internal_api/public/non_blocking_sync_common.h"
 
 namespace syncer_v2 {
-class ModelTypeProcessor;
+struct ActivationContext;
 
 // Interface for the datatype integration logic from non-sync threads.
 //
@@ -21,13 +20,9 @@ class SYNC_EXPORT_PRIVATE SyncContextProxy {
   virtual ~SyncContextProxy();
 
   // Attempts to connect a non-blocking type to the sync context.
-  //
-  // Must be called from the thread where the data type lives.
   virtual void ConnectTypeToSync(
       syncer::ModelType type,
-      const DataTypeState& data_type_state,
-      const UpdateResponseDataList& saved_pending_updates,
-      const base::WeakPtr<ModelTypeProcessor>& type_processor) = 0;
+      scoped_ptr<ActivationContext> activation_context) = 0;
 
   // Tells the syncer that we're no longer interested in syncing this type.
   //