diff -r 1eef62f5c541 -r 2a5d4ab426d3 phoneplugins/csplugin/inc/csprovider.h
--- a/phoneplugins/csplugin/inc/csprovider.h	Mon Aug 23 15:42:12 2010 +0300
+++ b/phoneplugins/csplugin/inc/csprovider.h	Fri Sep 03 13:33:36 2010 +0300
@@ -33,6 +33,7 @@
 #include "mcsppubsubobserver.h"
 #include "mcspremotealertingtoneobserver.h"
 #include "mcspconferencestatusobserver.h"
+#include "mcsptestcallprovider.h"
 
 
 // FORWARD DECLARATIONS
@@ -42,7 +43,6 @@
 class CSPEtelCallAddedMonitor;
 class CSPConferenceCall;
 class CSPCallArray;
-class CSPAudioHandler;
 class CSPEtelCallWaitingRequester;
 class CSPSupplementaryServicesMonitor;
 class MCCPSsObserver;
@@ -53,6 +53,8 @@
 class CSPCallCommandHandler;
 class CSPRemoteAlertingToneListener;
 class CSPEtelConferenceStatusMonitor; 
+class CSPAudioHandlerBase;
+
 
 /**
 * Main class for using CS Call Plug-in. Implements the CCP API.
@@ -66,7 +68,8 @@
                    public MCSPSecuritySettingObserver,
                    public MCSPPubSubObserver,
                    public MCSPRemoteAlertingToneObserver, 
-                   public MCSPConferenceStatusObserver
+                   public MCSPConferenceStatusObserver,
+                   public MCSPTestCallProvider
 {
     public:
     
@@ -88,6 +91,21 @@
         */ 
         void NotifySsEvent( RMmCustomAPI::TSsTypeAndMode& aSsTypeAndMode,
                             RMmCustomAPI::TSsInfo& aSsInfo );
+        
+        
+// from base class MCSPTestCallProvider
+        
+        /**
+         * Initializes call provider for testing purposes. 
+         * @since S60 10.1         
+         * @param aObserver general observer
+         * @param aSsObserver observer for events related to supplementary 
+         *        services.
+         * @param aAudioHandler AudioHandler implementation for testing purposes.
+         */
+        void InitializeL( const MCCPObserver& aObserver,
+                          const MCCPSsObserver& aSsObserver,
+                          CSPAudioHandlerBase* aAudioHandler );
 
 
 // from base class CConvergedCallProvider    
@@ -543,10 +561,10 @@
         TUint32 iServiceId;
         
         /**
-        * Dev sound handler.
+        * Audio interface.
         * Own.
         */
-        CSPAudioHandler* iAudioHandler;
+        CSPAudioHandlerBase* iAudioHandler;
         
         /**
         * Call waiting requester.