--- a/multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/src/UT_CMccRtpDataSink.cpp	Wed Sep 15 12:38:06 2010 +0300
+++ b/multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/src/UT_CMccRtpDataSink.cpp	Wed Oct 13 14:59:15 2010 +0300
@@ -42,7 +42,6 @@
 #include <srtpmastersalt.h>
 #include <srtpstreamout.h>
 #include "mccunittestmacros.h"
-#include "mccrtpmediaclock.h"
 
 
 #define MCCEVENTDATAPCKG_TO_RTCPEVENTDATAPCKG( event )\
@@ -116,7 +115,6 @@
                                          *iRtpApi, 
                                          rtpSessionId ); 
                                          
-    iRtpMediaClock = CMccRtpMediaClock::NewL();                                     
     } 
 
 void UT_CMccRtpDataSink::Teardown()
@@ -138,12 +136,6 @@
         delete iRtpApi;
         iRtpApi = NULL;
         }
-        
-    if ( iRtpMediaClock )
-        {
-        delete iRtpMediaClock;
-        iRtpMediaClock = NULL;
-        }
     }
 
 // HELPERS
@@ -164,7 +156,7 @@
     TMccCodecInfo cInfo;
     TMccCodecInfoBuffer cInfoBuf( cInfo );
     
-    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) );
+    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) );
     }
 
 
@@ -226,7 +218,7 @@
     
     TMccCodecInfo cInfo;
     TMccCodecInfoBuffer cInfoBuf( cInfo );
-    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) );
+    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) );
     MCC_EUNIT_ASSERT_EQUALS( iSink->SinkThreadLogon( *this ), KErrNone );
     iSink->SetCurrentUser( this );
     EUNIT_ASSERT_NO_LEAVE( iSink->SinkPrimeL() );
@@ -297,7 +289,7 @@
     MCC_EUNIT_ASSERT_EQUALS( iSink->SinkThreadLogon( *this ), KErrNone );
     iSink->SetCurrentUser( this );
     EUNIT_ASSERT_NO_LEAVE( iSink->SetSessionParamsL( params ) );
-    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) );
+    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) );
     EUNIT_ASSERT_NO_LEAVE( iSink->SinkPrimeL() );
     iSink->SinkThreadLogoff();
     }
@@ -374,7 +366,7 @@
     TMccCodecInfo cInfo;
     TMccCodecInfoBuffer cInfoBuf( cInfo );
     
-    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) );
+    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) );
     EUNIT_ASSERT_NO_LEAVE( iSink->SinkPrimeL() );
     EUNIT_ASSERT( iRtpKeepaliveMechanism->iStopped == EFalse );
   
@@ -623,7 +615,7 @@
     TMccCodecInfo cInfo;
     TMccCodecInfoBuffer cInfoBuf( cInfo );
     
-    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) );
+    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) );
     EUNIT_ASSERT_NO_LEAVE( iSink->SinkPrimeL() ); 
 
     // Create a comfort noise stream
@@ -646,12 +638,12 @@
     TMccCodecInfo cInfo;
     TMccCodecInfoBuffer cInfoBuf( cInfo );
     
-    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) );
+    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) );
 
     // This should leave because the string is too short
     TBuf8<5> dummy;
     dummy.Format( _L8( "foo42" ) );
-    EUNIT_ASSERT_LEAVE( iSink->ConfigureL( dummy, iRtpMediaClock ) );
+    EUNIT_ASSERT_LEAVE( iSink->ConfigureL( dummy ) );
 
     // Get a new sink
     //Teardown();
@@ -698,7 +690,7 @@
     cInfo2.iAlgoUsed = EGenRedUsed;
     TMccCodecInfoBuffer cInfoBuf2( cInfo2 );
 
-    EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf2, iRtpMediaClock ) );
+    EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf2 ) );
     }
 
 void UT_CMccRtpDataSink::UT_CMccRtpDataSink_RemoveStreamLL()
@@ -749,7 +741,7 @@
     TMccCodecInfo cInfo;
     TMccCodecInfoBuffer cInfoBuf( cInfo );
     
-    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) );
+    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) );
 
     // Wrong state
     EUNIT_ASSERT_LEAVE( iSink->SinkPlayL() );
@@ -778,7 +770,7 @@
     TMccCodecInfo cInfo;
     TMccCodecInfoBuffer cInfoBuf( cInfo );
     
-    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) );
+    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) );
 
     // Wrong state
     EUNIT_ASSERT_LEAVE( iSink->SinkPauseL() );
@@ -805,7 +797,7 @@
     TMccCodecInfo cInfo;
     TMccCodecInfoBuffer cInfoBuf( cInfo );
     
-    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) );
+    MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) );
     iSink->SinkPrimeL();
     iSink->SinkPlayL();