diff -r 73a1feb507fb -r bc78a40cd63c mmshplugins/mmshaoplugin/inc/muscallmonitorbase.h
--- a/mmshplugins/mmshaoplugin/inc/muscallmonitorbase.h	Tue Aug 31 15:12:07 2010 +0300
+++ b/mmshplugins/mmshaoplugin/inc/muscallmonitorbase.h	Wed Sep 01 12:31:01 2010 +0100
@@ -23,7 +23,6 @@
 #include "musunittesting.h"
 #include "mussesseioninformationapi.h"
 #include "mmustsypropertyobserver.h"
-#include "mmuscallstateobserver.h"
 #include <etelmm.h>
 #include <e32base.h>
 
@@ -58,11 +57,6 @@
          * CActive Implentation
          */
         TInt RunError( TInt aError ); 
-        
-        /**
-         * Checks if it the data is ready for the CS Call
-         */
-        TBool IsDataReadyL();
 
         
     protected:
@@ -70,15 +64,30 @@
         /**
          * C++ constructor.
          */
-        CMusCallMonitorBase( const RMobileCall& aCall,   
-                                MMusTsyPropertyObserver& aObserver, 
-                                MMusCallStateObserver& aCallStateObserver );
+        CMusCallMonitorBase( const RMobileCall& aCall, MMusTsyPropertyObserver& aObserver );
         
         /**
          * Notify observer that our state changed
          */
         virtual void NotifyCallStateChanged( NMusSessionInformationApi::TMusCallEvent aVal );
         
+        /**
+         * Inspect the dialled number and set the PS key controlling whether
+         * to add Privacy-header accordingly.
+         */        
+        void SetClirSetting( const TDesC& aDialledNumber ) const;
+
+         /**
+         * Should set the privacy ps key to on off based on incoming cs call privacy settings.
+         * aCallInfo : Callinfo package read from current cs call.     
+         */
+        void SetTerminatingPrivacy( const RMobileCall& aCall ) const;
+        
+        /**
+        * Removes privacy prefix away from phone number
+        * @return returns dialed number witout prefix.  
+        */
+        HBufC* RemovePrefix( const TDesC& aOriginator ) const;
         
     protected:            
        
@@ -103,17 +112,11 @@
          *  Observer to get nofitied when RCall status changed 
          */
         MMusTsyPropertyObserver& iTsyObserver;
-        
-        
-        /*
-         * Reference of callstate observer not owned
-         */
-        MMusCallStateObserver& iCallStateObserver;
-
 
         MUS_UNITTEST( UT_CMusCallMonitor )
- 		MUS_UNITTEST( UT_CMusCallEventMonitor )
- 		MUS_UNITTEST( UT_CMusCallStatusMonitor )
+        MUS_UNITTEST( UT_CMusCallEventMonitor ) 
+        MUS_UNITTEST( UT_CMusCallStatusMonitor )
+        MUS_UNITTEST( UT_CMusCallMonitorBase )
     };
 
 #endif // MUSAOCALLMONITORBASE_H