USS SyncContextProxy / data type activation refactoring

sync/internal_api/public/test/null_sync_context_proxy.h

Index: sync/internal_api/public/test/null_sync_context_proxy.h
diff --git a/sync/internal_api/public/test/null_sync_context_proxy.h b/sync/internal_api/public/test/null_sync_context_proxy.h
index 899331f2aaa9f123f07506016902ef0da1fa1a88..b41d963a0a928e08a7642f616f67209094f09220 100644
--- a/sync/internal_api/public/test/null_sync_context_proxy.h
+++ b/sync/internal_api/public/test/null_sync_context_proxy.h
@@ -5,12 +5,9 @@
 #ifndef SYNC_INTERNAL_API_PUBLIC_TEST_NULL_SYNC_CONTEXT_PROXY_H_
 #define SYNC_INTERNAL_API_PUBLIC_TEST_NULL_SYNC_CONTEXT_PROXY_H_
 
-#include "base/memory/weak_ptr.h"
-#include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/internal_api/public/sync_context_proxy.h"
 
 namespace syncer_v2 {
-class ModelTypeProcessor;
 
 // A non-functional implementation of SyncContextProxy.
 //
@@ -22,9 +19,7 @@ class NullSyncContextProxy : public SyncContextProxy {
 
   void ConnectTypeToSync(
       syncer::ModelType type,
-      const DataTypeState& data_type_state,
-      const UpdateResponseDataList& saved_pending_updates,
-      const base::WeakPtr<ModelTypeProcessor>& type_processor) override;
+      scoped_ptr<ActivationContext> activation_context) override;
   void Disconnect(syncer::ModelType type) override;
   scoped_ptr<SyncContextProxy> Clone() const override;
 };