USS SyncContextProxy / data type activation refactoring

sync/internal_api/test/null_sync_context_proxy.cc

Index: sync/internal_api/test/null_sync_context_proxy.cc
diff --git a/sync/internal_api/test/null_sync_context_proxy.cc b/sync/internal_api/test/null_sync_context_proxy.cc
index 9beb2f4cdcc941c9cb86abbd7d6a72d1a7df1efe..9ae5fcfdbce9aeaad3410a8807e99c8ca89fc342 100644
--- a/sync/internal_api/test/null_sync_context_proxy.cc
+++ b/sync/internal_api/test/null_sync_context_proxy.cc
@@ -14,9 +14,7 @@ NullSyncContextProxy::~NullSyncContextProxy() {
 
 void NullSyncContextProxy::ConnectTypeToSync(
     syncer::ModelType type,
-    const DataTypeState& data_type_state,
-    const UpdateResponseDataList& saved_pending_updates,
-    const base::WeakPtr<ModelTypeProcessor>& type_processor) {
+    scoped_ptr<ActivationContext> activation_context) {
   NOTREACHED() << "NullSyncContextProxy is not meant to be used";
 }