diff -r 21d2ab05f085 -r dee179edb159 datacommsserver/esockserver/test/providers/dummy/inc/dummypr_metaconnprov.h
--- a/datacommsserver/esockserver/test/providers/dummy/inc/dummypr_metaconnprov.h	Thu Jan 07 13:34:53 2010 +0200
+++ b/datacommsserver/esockserver/test/providers/dummy/inc/dummypr_metaconnprov.h	Mon Jan 18 21:26:35 2010 +0200
@@ -26,12 +26,11 @@
 #include <comms-infras/ss_coreprstates.h>
 #include <comms-infras/mobilitymcpr.h>
 
-class CMCPrPubSubAvailability;
-class CMCPrPubSubStopTrigger;
+class CMCPrPubSubSubscriber;
 
 struct TCprConfigModifier
 	{
-	enum
+	enum 
 	/*
 	Bits on the CprConfig.
 	This is a very naive way of instructing the dummy providers to respond to
@@ -44,11 +43,11 @@
 		ESCPRHangOnStart  = 2,			  //when lit on CprConfig, the SCPR will hang on start
 		ESCPRFailOnRebind = 3,            //when lit on CprConfig, the SCPR will fail on rebind
 		};
-
-	static TBool Is(TInt aValue, TInt aFlags)
+	
+	static TBool Is(TInt aValue, TInt aFlags) 
 	    {
 	    aFlags = (1 << aFlags);
-	    return aValue & aFlags;
+	    return aValue & aFlags; 
 	    }
 	};
 
@@ -66,12 +65,11 @@
 	virtual ~CDummyMetaConnectionProvider();
 	virtual void ReceivedL(const Messages::TRuntimeCtxId& aSender, const Messages::TNodeId& aRecipient, Messages::TSignatureBase& aMessage);
 	virtual void ConstructL();
-
+	
 	virtual void StartAvailabilityMonitoringL(const Messages::TNodeCtxId& aAvailabilityActivity); //Default implementation, usually empty on the mid-tier MCprs
     virtual void CancelAvailabilityMonitoring(); //Default implementation, usually empty on the mid-tier MCprs
-
-    CMCPrPubSubAvailability* iPubSubAvailability;
-    CMCPrPubSubStopTrigger* iPubSubStopTrigger;
+    
+    CMCPrPubSubSubscriber* iPubSubSubscriber;    
     };
 
 namespace DummyMCPRStates